Changeset 264 for trunk/idl-compiler/parser_c

Timestamp:

Mar 24, 2007, 7:17:11 PM (18 years ago)

Author:

cinc

Message:

More code...

Location:

trunk/idl-compiler/parser_c

Files:

• hash_parser.c (added)
• interface_parser.c (modified) (3 diffs)
• lineinfo_parser.c (added)
• method_parser.c (modified) (2 diffs)
• override_parser.c (modified) (2 diffs)

trunk/idl-compiler/parser_c/interface_parser.c

@@ -37 +37 @@
 
 #include <glib.h> 
+#include <glib/gprintf.h> 
 #include "parser.h"
 
@@ -71 +72 @@
 
   do{
-    //g_printf("%d: ", __LINE__);
-    //printToken(curToken);
+    g_printf("%d: ", __LINE__);
+    printToken(curToken);
     if(matchNext(IDL_SYMBOL_CLSVERSION))
       parseClassVersion();
@@ -85 +86 @@
     else
       {
-        //g_message("Line %d Error in'interface' deklaration %d", g_scanner_cur_line(gScanner),
-        //        g_scanner_peek_next_token(gScanner));
-        //g_printf("%d: ", __LINE__);
-        //printToken(curToken);
-        /* Unknown token, skip it. */
         getNextToken();
-        //exit(1);
+        g_scanner_unexp_token(gScanner,
+                              G_TOKEN_IDENTIFIER,
+                              NULL,
+                              NULL,
+                              NULL,
+                              "Trying to parse interface body.",
+                              TRUE); /* is_error */
+        exit(1);
       }
     }while(g_scanner_peek_next_token(gScanner)!='}');

trunk/idl-compiler/parser_c/method_parser.c

@@ -36 +36 @@
 
 #include <glib.h> 
+#include <glib/gprintf.h> 
 #include "parser.h"
 
@@ -150 +151 @@
   PMETHOD pMethod=createMethodStruct();
   PINTERFACE pif;
-  //g_printf("%d: ", __LINE__);
-  //printToken(curToken);
+  g_printf("%s %d: ", __FUNCTION__, __LINE__);
+  printToken(curToken);
 
   /* Do type spec */

trunk/idl-compiler/parser_c/override_parser.c

@@ -73 +73 @@
   GTokenValue value;
   POVERMETHOD pOMethod=g_malloc0(sizeof(OVERMETHOD));
+  PINTERFACE pif;
 
   if(!matchNext('('))
@@ -103 +104 @@
 
   /* Now check if the method was introduced by some parent */
-  if(!findInterfaceForMethod(pCurInterface, pOMethod->chrName))
+  if((pif=findInterfaceForMethod(pCurInterface, pOMethod->chrName))==NULL)
     {
+
       g_message("%s:%d: Method '%s' was not introduced by some parent interface.", gScanner->input_name,
                 g_scanner_cur_line(gScanner), pOMethod->chrName);
       exit(1);
     }
+  pOMethod->chrIntroducingIFace=pif->chrName; /* No copy of string here. Nobody should free the
+                                               interface info under our feet. */
 
   if(!matchNext(')'))