Changeset 264 for trunk/idl-compiler

Timestamp:

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

Author:

cinc

Message:

More code...

Location:

trunk/idl-compiler

Files:

• Makefile (modified) (1 diff)
• c/nom-idl-compiler.c (modified) (3 diffs)
• c/token.c (modified) (3 diffs)
• include/parser.h (modified) (3 diffs)
• parser_c/hash_parser.c (added)
• parser_c/interface_parser.c (modified) (3 diffs)
• parser_c/lineinfo_parser.c (added)
• parser_c/method_parser.c (modified) (2 diffs)
• parser_c/override_parser.c (modified) (2 diffs)

trunk/idl-compiler/Makefile

@@ -32 +32 @@
                         $(OBJDIR)/classversion_parser.o \
                         $(OBJDIR)/override_parser.o \
+                        $(OBJDIR)/hash_parser.o \
+                        $(OBJDIR)/lineinfo_parser.o \
                         $(OBJDIR)/printdata.o
 

trunk/idl-compiler/c/nom-idl-compiler.c

@@ -162 +162 @@
         parseInterface(token);
         break;
+      case '#':
+        parseHash();
+        break;
 
 #if 0
@@ -181 +184 @@
       case ';':
         g_message("Token: %d (semicolon)\t\t\t;", token);
-        break;
-      case '#':
-        g_message("Token: %d (hash)\t\t\t#", token);
         break;
       case '/':
@@ -315 +315 @@
   parseIt();
 
-  if(pInterfaceArray->len)
-    printInterface();
+  //if(pInterfaceArray->len)
+  //  printInterface();
 
   g_scanner_destroy(gScanner);

trunk/idl-compiler/c/token.c

@@ -159 +159 @@
     {
     case IDL_SYMBOL_INTERFACE:
-      g_message("Token: %d (IDL_SYMBOL_INTERFACE)\tParsing...", token);
+      g_message("Token: %d (IDL_SYMBOL_INTERFACE)\t\t\t (LINE %d)", token, g_scanner_cur_line(gScanner));
       break;
     case G_TOKEN_IDENTIFIER:
-      g_message("Token: %d (G_TOKEN_IDENTIFIER)\t\t%s", token, value.v_identifier);
+      g_message("Token: %d (G_TOKEN_IDENTIFIER)\t\t%s (LINE %d)",
+                token, value.v_identifier, g_scanner_cur_line(gScanner));
       break;
     case G_TOKEN_STRING:
@@ -168 +169 @@
       break;
     case G_TOKEN_LEFT_PAREN:
-      g_message("Token: %d (G_TOKEN_LEFT_PAREN)\t\t(", token);
+      g_message("Token: %d (G_TOKEN_LEFT_PAREN)\t\t\t( (LINE %d)", token, g_scanner_cur_line(gScanner));
       break;
     case G_TOKEN_RIGHT_PAREN:
-      g_message("Token: %d (G_TOKEN_RIGHT_PAREN)\t\t)", token);
+      g_message("Token: %d (G_TOKEN_RIGHT_PAREN)\t\t\t) (LINE %d)", token, g_scanner_cur_line(gScanner));
+      break;
+    case G_TOKEN_LEFT_CURLY:
+      g_message("Token: %d (G_TOKEN_LEFT_CURLY)\t\t\t{ (LINE %d)", token, g_scanner_cur_line(gScanner));
+      break;
+    case G_TOKEN_RIGHT_CURLY:
+      g_message("Token: %d (G_TOKEN_RIGHT_CURLY)\t\t\t} (LINE %d)", token, g_scanner_cur_line(gScanner));
       break;
     case ':':
@@ -201 +208 @@
       break;
     default:
-      g_message("Token: %d (---)\t\t\t (LINE %d)", token, g_scanner_cur_line(gScanner));
-      break;
-    }
-}
+      {
+        PSYMBOLINFO psi;
+        psi=(PSYMBOLINFO)gScanner->user_data;
+
+        if(token>G_TOKEN_LAST)
+          g_message("Token: %d (%s)\t\t\t (LINE %d)", token,
+                    psi->pSymbols[token-G_TOKEN_LAST-1].chrSymbolName, g_scanner_cur_line(gScanner));
+        else
+          g_message("Token: %d (---)\t\t\t (LINE %d)", token, g_scanner_cur_line(gScanner));
+        break;
+      } /* default */
+    } /* switch */
+}

trunk/idl-compiler/include/parser.h

@@ -51 +51 @@
 {
   gchar* chrName;    /* Name of this instance variable */
+  gchar* chrIntroducingIFace;
 }OVERMETHOD, *POVERMETHOD;
 
@@ -100 +101 @@
   const SYMBOL    *pSymbols;     /* List of our introduced symbols */
   guint     uiCurSymbolKind;
+  guint     uiLineCorrection;    /* This is the line number put by the preprocessor into
+                                    the source file. It's used to calculate proper line numbers
+                                    for errors. */
+  char*     chrCurrentSourceFile;/* The preprocessor includes files for us. This is the info
+                                    about their name. */
 }SYMBOLINFO,*PSYMBOLINFO; 
 
@@ -145 +151 @@
 void parseClassVersion(void);
 void parseOverrideMethod(void);
+void parseHash(void);
+void parsePreprocLineInfo(void);
 
-

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(')'))