Changeset 382

Timestamp:

Jul 1, 2008, 9:49:27 PM (17 years ago)

Author:

cinc

Message:

Allow for empty class bodies.

File:

• trunk/nomc/parser_c/class_parser.c (modified) (6 diffs)

trunk/nomc/parser_c/class_parser.c

@@ -124 +124 @@
 
 
+/*
+ Function to parse the body of a class.
+ Current token is '{'.
+ 
+ CBODY:= '}'   //This is an empty class body
+        | CLASSMETHODS '}'
+ */
+/*
+ 
+ CLASSMETHODS:=  CLASSMETHOD
+               | CLASSMETHOD CLASSMETHODS
+ */
 
 /*
@@ -129 +141 @@
   Current token is '{'.
 
-  CBODY:= 
+  CBODY:= '}'   //This is an empty class body
+         | IMPL CLASSMETHODS '}'
  
  */
 static void parseCBody(void)
 {
-  /* Current token is '{' */
-  PPARSEINFO pParseInfo=(PPARSEINFO)gScanner->user_data;
-
-
-  do{
+  PPARSEINFO pParseInfo=(PPARSEINFO)gScanner->user_data;
+
+  while(g_scanner_peek_next_token(gScanner)!= G_TOKEN_EOF && g_scanner_peek_next_token(gScanner)!='}')
+  {
     PSYMBOL pCurSymbol;
     GTokenValue value;
-        
-    //pParseInfo->fPrintToken=TRUE;
-    //printToken(gScanner->token);
     
     /* Method implementations must start with "impl" which is registered as a symbol. Here we check if
      the token is a symbol. */
-    TST_NEXT_TOKEN_NOT_OK(G_TOKEN_SYMBOL, "Method implementation must start with 'impl'.");
+    exitIfNotMatchNext(G_TOKEN_SYMBOL, "Method implementation must start with 'impl'.");
 
     value=gScanner->value;
@@ -157 +166 @@
       g_scanner_unexp_token(gScanner,
                             G_TOKEN_SYMBOL,
-                            NULL,
-                            NULL,
-                            NULL,
+                            NULL, NULL, NULL,
                             "'impl'.",
                             TRUE); /* is_error */
@@ -176 +183 @@
       g_scanner_unexp_token(gScanner,
                             G_TOKEN_IDENTIFIER,
-                            NULL,
-                            NULL,
-                            NULL,
+                            NULL, NULL, NULL,
                             "Expected return type specifier.",
                             TRUE); /* is_error */
       cleanupAndExit(1);
     }
-  }while(g_scanner_peek_next_token(gScanner)!= G_TOKEN_EOF && g_scanner_peek_next_token(gScanner)!='}');
-
+  };
+
+  exitIfNotMatchNext('}',  "No closing of 'class' section.");
 }
 
@@ -193 +199 @@
   Current token is CLASSIDENT.
 
-  CLASSBODY:=  '{' CBODY '}'
-             | '{' CBODY '}' ';'
+  CLASSBODY:=  '{' CBODY
+             | '{' CBODY ';'
 
 */
@@ -203 +209 @@
     
   parseCBody();
-
-  exitIfNotMatchNext('}',  "No closing of 'interface' section.");
     
   /* Remove a terminating ';' from the input if present. */