Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Unified Diff: runtime/vm/class_finalizer.h

Issue 21049012: Update VM to handle malformed types according to revised spec (issues 9055, (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/lib/object.cc ('k') | runtime/vm/class_finalizer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/class_finalizer.h
===================================================================
--- runtime/vm/class_finalizer.h (revision 25651)
+++ runtime/vm/class_finalizer.h (working copy)
@@ -34,16 +34,11 @@
kDoNotResolve, // Type resolution is postponed.
kResolveTypeParameters, // Resolve type parameters only.
kFinalize, // Type resolution and type finalization are
- // required; a malformed type is tolerated, since
- // the type may be used as a type annotation.
+ // required; replace a malformed type by dynamic.
kCanonicalize, // Same as kFinalize, but with canonicalization.
- kCanonicalizeExpression, // Same as kCanonicalize, but do not tolerate
- // wrong number of type arguments or ambiguous
- // type reference, since the type is not used as
- // a type annotation, but as a type expression.
kCanonicalizeWellFormed // Error-free resolution, finalization, and
// canonicalization are required; a malformed
- // type is not tolerated.
+ // type is marked as such.
};
// Finalize given type while parsing class cls.
@@ -59,9 +54,8 @@
static RawType* NewFinalizedMalformedType(const Error& prev_error,
const Class& cls,
intptr_t type_pos,
- FinalizationKind finalization,
const char* format, ...)
- PRINTF_ATTRIBUTE(5, 6);
+ PRINTF_ATTRIBUTE(4, 5);
// Depending on the given type, finalization mode, and execution mode, mark
// the given type as malformed or report a compile time error.
@@ -70,9 +64,8 @@
static void FinalizeMalformedType(const Error& prev_error,
const Class& cls,
const Type& type,
- FinalizationKind finalization,
const char* format, ...)
- PRINTF_ATTRIBUTE(5, 6);
+ PRINTF_ATTRIBUTE(4, 5);
// Return false if we still have classes pending to be finalized.
static bool AllClassesFinalized();
@@ -145,7 +138,6 @@
static void ReportMalformedType(const Error& prev_error,
const Class& cls,
const Type& type,
- FinalizationKind finalization,
const char* format,
va_list args);
static void ReportError(const Error& error);
« no previous file with comments | « runtime/lib/object.cc ('k') | runtime/vm/class_finalizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698