Changeset 2141

Timestamp:

06/30/08 16:02:07 (4 months ago)

Author:

sukyoungryu

Message:

[parser] Added better error messages for component/API definitions missing the 'end' keyword.

Files:

• trunk/ProjectFortress/parser_tests/XXXmissingAPIEnd.fsi (added)
• trunk/ProjectFortress/parser_tests/XXXmissingComponentEnd.fss (added)
• trunk/ProjectFortress/src/com/sun/fortress/parser/Compilation.rats (modified) (2 diffs)

trunk/ProjectFortress/src/com/sun/fortress/parser/Compilation.rats

@@ -109 +109 @@
-       else
-           yyValue = new Component(span, true, a2, a3, a4, a5);
+     }
+   / <ErrorProduction3>
+     (native w)? component w APIName (w Imports w semicolon?)? w
+     Exports w semicolon? (w Decls w semicolon?)? w
+     { yyValue = syntaxError(createSpan(yyStart,yyCount),
+                             "The \"end\" keyword is missing from a component definition.");
-     };
-
-/* Api ::= api w APIName (w Imports w ;?)? (w AbsDecls w ;?)? w end */
-private Api Api =
-
+1
-     native w api w APIName (w Imports w semicolon?)?
-     (w AbsDecls w semicolon?)? w end
@@ -125 +131 @@
-       Span span = createSpan(yyStart,yyCount);
-       yyValue = new Api(span, a1, a2, a3);
+     }
+   / <ErrorProduction2>
+     api w APIName (w Imports w semicolon?)? (w AbsDecls w semicolon?)? w
+     { yyValue = syntaxError(createSpan(yyStart,yyCount),
+                             "The \"end\" keyword is missing from an API definition.");
-     };
-