Changeset 265 for trunk/idl-compiler/parser_c

Timestamp:

Mar 24, 2007, 9:08:34 PM (18 years ago)

Author:

cinc

Message:

Rewrote symbol handling.

Location:

trunk/idl-compiler/parser_c

Files:

• interface_parser.c (modified) (1 diff)
• method_parser.c (modified) (3 diffs)

trunk/idl-compiler/parser_c/interface_parser.c

@@ -72 +72 @@
 
   do{
-    g_printf("%d: ", __LINE__);
-    printToken(curToken);
-    if(matchNext(IDL_SYMBOL_CLSVERSION))
-      parseClassVersion();
-    if(matchNext(IDL_SYMBOL_OVERRIDE))
-      parseOverrideMethod();
-    else if(matchNext(IDL_SYMBOL_INSTANCEVAR))
-      parseInstanceVar();
-    else if(matchNextKind(KIND_TYPESPEC)) /* Be aware that we don't compare types here */
+    //  g_printf("%d: ", __LINE__);
+    //  printToken(curToken);
+
+    /* Typespec check must be first */
+    if(matchNextKind(KIND_TYPESPEC)) /* Be aware that we don't compare types here */
       {
         parseMethod();
+      }
+    else if(matchNext(G_TOKEN_SYMBOL))
+      {
+        PSYMBOL pCurSymbol;
+        GTokenValue value;
+        
+        value=gScanner->value;
+        pCurSymbol=value.v_symbol;
+        switch(pCurSymbol->uiSymbolToken)
+          {
+          case IDL_SYMBOL_CLSVERSION:
+            parseClassVersion();
+            break;
+          case IDL_SYMBOL_OVERRIDE:
+            parseOverrideMethod();
+            break;
+          case IDL_SYMBOL_INSTANCEVAR:
+            parseInstanceVar();
+            break;
+          default:
+            g_scanner_unexp_token(gScanner,
+                                  G_TOKEN_SYMBOL,
+                                  NULL,
+                                  NULL,
+                                  NULL,
+                                  "Trying to parse interface body.",
+                                  TRUE); /* is_error */
+            exit(1);
+          }/* switch */
       }
     else

trunk/idl-compiler/parser_c/method_parser.c

@@ -66 +66 @@
   GTokenValue value;
   PMETHODPARAM pParam;
+  PSYMBOL pCurSymbol;
 
   do{ 
@@ -84 +85 @@
       }
 
-    switch(curToken)
+    value=gScanner->value;
+    pCurSymbol=value.v_symbol;
+    switch(pCurSymbol->uiSymbolToken)
       {
       case IDL_SYMBOL_IN:
@@ -151 +154 @@
   PMETHOD pMethod=createMethodStruct();
   PINTERFACE pif;
-  g_printf("%s %d: ", __FUNCTION__, __LINE__);
-  printToken(curToken);
+  //g_printf("%s %d: ", __FUNCTION__, __LINE__);
+  //printToken(curToken);
 
   /* Do type spec */