Changeset 3899

Timestamp:

06/29/09 09:55:45 (5 months ago)

Author:

sukyoungryu

Message:

[parser] Implemented checking that 1) operator declarations not allowed in block expressions and 2) comprises clauses should not be empty. Added tests.

Location:

trunk/ProjectFortress

Files:

• compiler_tests/Compiled5.at.fss (added)
• compiler_tests/Compiled5.au.fss (added)
• compiler_tests/Compiled5.av.fss (added)
• compiler_tests/XXX5at.test (added)
• compiler_tests/XXX5au.test (added)
• compiler_tests/XXX5av.test (added)
• src/com/sun/fortress/parser/NoNewlineHeader.rats (modified) (1 diff)
• src/com/sun/fortress/parser/preparser/PreCompilation.rats (modified) (2 diffs)
• src/com/sun/fortress/parser/preparser/PreParserState.java (modified) (4 diffs)

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

@@ -86 +86 @@
        NodeUtil.validTraitTypes(writer, Useful.list(a1));
      }
-   / comprises w void:opencurly w ComprisingTypeList w void:closecurly ;
+   / comprises w opencurly a1:(w ComprisingTypeList)? w closecurly
+     { if (a1 == null) {
+           Span span = createSpan(yyStart,yyCount);
+           log(span, "Comprises clauses should not be empty.");
+           yyValue = new Comprises(span, Collections.<BaseType>emptyList(), false);
+       } else yyValue = a1;
+     };
 
 /* ComprisingTypeList ::=

trunk/ProjectFortress/src/com/sun/fortress/parser/preparser/PreCompilation.rats

@@ -76 +76 @@
    / object      { yyState.left(createSpan(yyStart,yyCount), "object"); }
    / trait       { yyState.left(createSpan(yyStart,yyCount), "trait"); }
-   / try         { yyState.left(createSpan(yyStart,yyCount), "try"); }
+   / try         { yyState.beginBlock();
+                   yyState.left(createSpan(yyStart,yyCount), "try"); }
    / typecase    { yyState.left(createSpan(yyStart,yyCount), "typecase"); }
    / also        { yyState.left(createSpan(yyStart,yyCount), "also"); }
@@ -88 +89 @@
    / end s object // ignore the object keyword
                  { yyState.right(createSpan(yyStart,yyCount), "end"); }
-   / end         { yyState.right(createSpan(yyStart,yyCount), "end"); }
+   / end         { yyState.handleEnd(createSpan(yyStart,yyCount)); }
    / do          { yyState.handleDo(createSpan(yyStart,yyCount)); }
    / at          { yyState.handleAt(createSpan(yyStart,yyCount)); }
+   / opr         { yyState.handleOpr(createSpan(yyStart,yyCount)); }
+   / then        { yyState.beginBlock(); }
+   / fn          { yyState.handleFn(); }
+   / "=>"        { yyState.handleDoubleArrow(); }
+   / QualifiedName w "=>" w Id
    / Encloser    // ignore vertical bars
    / a1:LeftEncloser  { yyState.left(a1); }

trunk/ProjectFortress/src/com/sun/fortress/parser/preparser/PreParserState.java

@@ -51 +51 @@
     /** Nested component/API definitions are not allowed. */
     private boolean sawCompilation = false;
+
+    /** Operator declarations are not allowed in block expressions. */
+    private boolean inBlock = false;
+    private boolean sawFn = false;
 
     /** Region annotation by "at" should be followed by "do". */
@@ -125 +129 @@
                     "Unmatched delimiters \"" + open + "\" and \"" + close + "\".");
             }
+            if ( open.getText().equals("(if") && close.getText().equals(")") )
+                inBlock = false;
         }
     }
@@ -147 +153 @@
             } else {
                 lefts.add(0, open);
-                right(close);
+                handleEnd(span);
             }
         }
@@ -163 +169 @@
         Debug.debug( Debug.Type.PARSER, 1, "HandleAt");
         sawAt = Option.<Span>some(span);
+    }
+
+    public void handleOpr(Span span) {
+        Debug.debug( Debug.Type.PARSER, 1, "HandleOpr");
+        for ( IdOrOp left : lefts ) {
+            if ( left.getText().equals("object") ) return;
+            if ( left.getText().equals("do") ||
+                 left.getText().startsWith("label$") ||
+                 inBlock )
+                log(span, "Operator declarations are not allowed in block expressions.");
+        }
+    }
+
+    public void beginBlock() {
+        inBlock = true;
+    }
+
+    public void handleFn() {
+        sawFn = true;
+    }
+
+    // "=>" does not introduce a block for import aliases and fn expressions.
+    public void handleDoubleArrow() {
+        if ( sawFn ) sawFn = false;
+        else if ( ! lefts.isEmpty() && ! lefts.get(0).getText().equals("{") )
+            inBlock = true;
+    }
+
+    public void handleEnd(Span span) {
+        if ( ! lefts.isEmpty() &&
+             ! lefts.get(0).getText().equals("object") )
+            inBlock = false;
+        right(span, "end");
     }