Changeset 385

Timestamp:

Jul 5, 2008, 5:58:51 PM (17 years ago)

Author:

cinc

Message:

Reworked class-, metod- and typespec parsers.

Location:

trunk/nomc

Files:

• c/util.c (modified) (1 diff)
• parser_c/class_parser.c (modified) (3 diffs)
• parser_c/classmethod_parser.c (modified) (4 diffs)
• parser_c/interface_parser.c (modified) (2 diffs)
• parser_c/interfacemethod_parser.c (modified) (2 diffs)
• parser_c/typespec_parser.c (modified) (3 diffs)

trunk/nomc/c/util.c

@@ -258 +258 @@
 void exitIfNotMatchNextKind(guint uiKind, gchar* msg)
 {
+  printToken(gScanner->token);
   if(!matchNextKind(uiKind))
   {

trunk/nomc/parser_c/class_parser.c

@@ -160 +160 @@
     }
 
-    /* Check if the token is a known (registered) type */
-    if(matchNextKind(KIND_TYPESPEC)) /* Be aware that we don't compare types here */
-    {
-      /* Get name, parameters and stuff. Print the body. */
-      parseClassMethod();
-    }
-    else
-    {
-      getNextToken();
-      g_scanner_unexp_token(gScanner,
-                            G_TOKEN_IDENTIFIER,
-                            NULL, NULL, NULL,
-                            "Expected return type specifier.",
-                            TRUE); /* is_error */
-      cleanupAndExit(1);
-    }
+    /* Get name, parameters and stuff. Print the body. */
+    parseClassMethod();
   };
 
@@ -225 +211 @@
   else
   {
-    if(matchNext(G_TOKEN_SYMBOL))
-    {
-      /* If the interface name is a symbol, it means the interface was
-       already registered before. Maybe because of a forward statement.
-       We will check that in the function which called us. */
-      
-      /* Check if it's one of our interface symbols */
-      PSYMBOL pCurSymbol;
-      GTokenValue value;
-      
-      value=gScanner->value;
-      pCurSymbol=value.v_symbol;
-      if(IDL_SYMBOL_REGINTERFACE!=pCurSymbol->uiSymbolToken)
-      {
-        /* No, some other symbol */
-        g_scanner_unexp_token(gScanner,
-                              G_TOKEN_SYMBOL,
-                              NULL, NULL, NULL,
-                              "Keyword 'class' is not followed by a valid identifier.",
-                              TRUE); /* is_error */
-        cleanupAndExit(1);
-      }
-
-      /* Save interface name */
-      return g_strdup(pCurSymbol->chrSymbolName);
-    }
-    else
-    {
+    PSYMBOL pCurSymbol;
+    GTokenValue value;
+
+    /* If the interface name is a symbol, it means the interface was
+     already registered before. Maybe because of a forward statement.
+     We will check that in the function which called us. */    
+    exitIfNotMatchNext(G_TOKEN_SYMBOL, "Keyword 'class' must be followed by an identifier");
+    
+    /* Check if it's one of our interface symbols */
+    value=gScanner->value;
+    pCurSymbol=value.v_symbol;
+    if(IDL_SYMBOL_REGINTERFACE!=pCurSymbol->uiSymbolToken)
+    {
+      /* No, some other symbol */
       g_scanner_unexp_token(gScanner,
-                            G_TOKEN_IDENTIFIER,
+                            G_TOKEN_SYMBOL,
                             NULL, NULL, NULL,
-                            "Keyword 'class' must be followed by an identifier",
+                            "Keyword 'class' is not followed by a valid identifier.",
                             TRUE); /* is_error */
       cleanupAndExit(1);
     }
+    
+    /* Save interface name */
+    return g_strdup(pCurSymbol->chrSymbolName);    
   }
 }
@@ -352 +327 @@
          | CLASSIDENT ':' PARENTCLASSIDENT CLASSBODY // Subclass (not used yet!)
          | CLASSIDENT CLASSBODY
- 
  */
 void parseClass(GTokenType token)

trunk/nomc/parser_c/classmethod_parser.c

@@ -109 +109 @@
     }
     
+    parseTypeSpec(pParam);
+#if 0
     /* Typespec */
     if(matchNextKind(KIND_TYPESPEC)) /* Be aware that we don't compare types here */
@@ -124 +126 @@
         cleanupAndExit(1);
       }
-
+#endif
     //pParam->chrType=getTypeSpecStringFromCurToken();
     //g_printf("%s %d", __FUNCTION__, __LINE__);
@@ -312 +314 @@
   /* Parse method */
   parseMethod(pMethod);
-  
 }
 
@@ -318 +319 @@
  
  CLASSMETHODS:=  IMPL METHOD
- ^             | IMPL METHOD  CLASSMETHODS
+               | IMPL METHOD  CLASSMETHODS
 */
  void parseClassMethods(void)

trunk/nomc/parser_c/interface_parser.c

@@ -137 +137 @@
     //printToken(gScanner->token);
 
+    parseInterfaceMethod();
+    
+#if 0
     /* Typespec check must be first */
     if(matchNextKind(KIND_TYPESPEC)) /* Be aware that we don't compare types here */
@@ -189 +192 @@
         exit(1);
       }
+#endif
     }while(g_scanner_peek_next_token(gScanner)!='}');
   //g_printf("%d: ", __LINE__);

trunk/nomc/parser_c/interfacemethod_parser.c

@@ -107 +107 @@
 
     /* Typespec */
+    parseTypeSpec(pParam);
+    
+#if 0
     if(matchNextKind(KIND_TYPESPEC)) /* Be aware that we don't compare types here */
       parseTypeSpec(pParam);
@@ -121 +124 @@
         cleanupAndExit(1);
       }
-
+#endif
+    
     //pParam->chrType=getTypeSpecStringFromCurToken();
     //g_printf("%s %d", __FUNCTION__, __LINE__);

trunk/nomc/parser_c/typespec_parser.c

@@ -54 +54 @@
  
  */
-void parseTypeSpec2(PMETHODPARAM pMethodParam)
+void parseTypeSpec(PMETHODPARAM pMethodParam)
 {
   char *chrTemp;
@@ -68 +68 @@
 }
 
-
+#if 0
 /*
   Parse a typespec e.g. 'gulong' or 'gulong*'.
@@ -103 +103 @@
     pMethodParam->uiStar++;
 }
+#endif
 
-
-
-
-