KT-222 Grammar Docu of objectLiteral slightly wrong

#KT-222 Fixed
JetBrains · Mar 28, 2012 · 7714f84 · 7714f84
1 parent 32e1018
commit 7714f84
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
@@ -1859,7 +1859,10 @@ private void parseValueArgument() {
         parseExpression();
         argument.done(VALUE_ARGUMENT);
     }
-
+
+    /*
+     * "object" (":" delegationSpecifier{","})? classBody // Cannot make class body optional: foo(object : F, A)
+     */
     public void parseObjectLiteral() {
         PsiBuilder.Marker literal = mark();
         PsiBuilder.Marker declaration = mark();

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java
@@ -1552,17 +1552,15 @@ else if (TYPE_REF_FIRST.contains(tt())) {
 
     /*
      * functionType
-     *   : (type ".")? "(" (parameter | modifiers type){","} ")" "->" type?
+     *   : (type ".")? "(" (parameter | modifiers type){","}? ")" "->" type?
      *   ;
      */
     private void parseFunctionType() {
         parseFunctionTypeContents().done(FUNCTION_TYPE);
     }
 
     private PsiBuilder.Marker parseFunctionTypeContents() {
-//        assert _at(LPAR) : tt();
+        assert _at(LPAR) : tt();
-        if (!_at(LPAR))
-            System.out.println(myBuilder.getTokenText());
         PsiBuilder.Marker functionType = mark();
 
 //        advance(); // LPAR

diff --git a/grammar/src/expressions.grm b/grammar/src/expressions.grm
@@ -266,7 +266,7 @@ arrayAccess
   ;
 
 objectLiteral
-  : "object" ":" delegationSpecifier{","}? classBody // Cannot make class body optional: foo(object : F, A)
+  : "object" (":" delegationSpecifier{","})? classBody // Cannot make class body optional: foo(object : F, A)
   ;
 
 /* Factory methods: