Changeset 266 for trunk/idl-compiler/parser_c

Timestamp:

Mar 25, 2007, 1:07:25 AM (18 years ago)

Author:

cinc

Message:

Getting along with parsing

Location:

trunk/idl-compiler/parser_c

Files:

• interface_parser.c (modified) (5 diffs)
• lineinfo_parser.c (modified) (3 diffs)

trunk/idl-compiler/parser_c/interface_parser.c

@@ -45 +45 @@
 /* The pointer array holding the interfaces we found */
 extern GPtrArray* pInterfaceArray;
-
+extern PARSEINFO parseInfo;
+
+static void registerInterface(void)
+{
+  PSYMBOL pNewSymbol=g_malloc0(sizeof(SYMBOL));
+
+  g_ptr_array_add(pInterfaceArray, (gpointer) pCurInterface);
+
+  /* Any found interface is registered as a new type so it can be
+     used in other classes. */
+  pNewSymbol->chrSymbolName=g_strdup(pCurInterface->chrName); /* We create a copy here because
+                                                                 when cleaning up the symbol space
+                                                                 the string will be freed. */
+  pNewSymbol->uiKind=KIND_TYPESPEC;
+  pNewSymbol->uiSymbolToken=IDL_SYMBOL_REGINTERFACE;
+  g_tree_insert(parseInfo.pSymbolTree, pNewSymbol, pNewSymbol->chrSymbolName);
+  g_scanner_scope_add_symbol(gScanner, ID_SCOPE, pNewSymbol->chrSymbolName,
+                             pNewSymbol);
+}
 
 static PINTERFACE createInterfaceStruct()
@@ -178 +196 @@
   interface is already defined.
 
-  IS:= G_TOKEN_INDENTIFIER IB2
+  IS:= G_TOKEN_SYMBOL IB2
+
+  It's G_TOKEN_SYMBOL here because every found interface is registered
+  as a new symbol with GScanner.
  */
 static void parseSubclassedIFace()
 {
+  PSYMBOL pCurSymbol;
 
   /* Parent interface */
-  if(!matchNext(G_TOKEN_IDENTIFIER))
-    {
-      g_scanner_unexp_token(gScanner,
-                            G_TOKEN_IDENTIFIER,
-                            NULL,
-                            NULL,
-                            NULL,
-                            "Parent interface name is missing.",
+  if(!matchNext(G_TOKEN_SYMBOL))
+    {
+      g_scanner_unexp_token(gScanner,
+                            G_TOKEN_SYMBOL,
+                            NULL,
+                            NULL,
+                            NULL,
+                            "Parent interface name is missing or unknown.",
                             TRUE); /* is_error */
       exit(1);
     }
   GTokenValue value=gScanner->value;
-  pCurInterface->chrParent=g_strdup(value.v_identifier);
+  /* Make sure it's the correct symbol */
+  pCurSymbol=value.v_symbol;
+
+  if(IDL_SYMBOL_REGINTERFACE!=pCurSymbol->uiSymbolToken)
+    {
+      g_scanner_unexp_token(gScanner,
+                            G_TOKEN_SYMBOL,
+                            NULL,
+                            NULL,
+                            NULL,
+                            "Parent interface name is unknown.",
+                            TRUE); /* is_error */
+      exit(1);
+    }
+  pCurInterface->chrParent=g_strdup(pCurSymbol->chrSymbolName);
 
   /* Check if the parent interface is known. */
@@ -209 +245 @@
                           TRUE); /* is_error */
     exit(1);
-
   }
 
@@ -238 +273 @@
   interface:= I ';'                       // Forward declaration
             | I '{' IB '}'
-            | I ':' G_TOKEN_INDENTIFIER '{' IB '}'
+            | I ':' G_TOKEN_SYMBOL '{' IB '}'
+
+            It's G_TOKEN_SYMBOL here because every found interface is registered
+            as a new symbol with GScanner.
  */
 void parseInterface(GTokenType token)
@@ -246 +284 @@
   /* Get the interface name */
   parseIFace(token);
+  /* It's save to register the interface right here even if the struct is almost empty. 
+     If anything goes wrong later we will exit anyway. */
+  registerInterface();  
 
   if(matchNext(';'))
     {
       pCurInterface->fIsForwardDeclaration=TRUE;
-      g_ptr_array_add(pInterfaceArray, (gpointer) pCurInterface);
-
     }
   else if(matchNext(':'))
     {
       parseSubclassedIFace();
-      g_ptr_array_add(pInterfaceArray, (gpointer) pCurInterface);
     }
   else if(matchNext('{'))
     {
       parseIFaceBody();
-      g_ptr_array_add(pInterfaceArray, (gpointer) pCurInterface);
     }
   else

trunk/idl-compiler/parser_c/lineinfo_parser.c

@@ -40 +40 @@
 
 extern GScanner *gScanner;
- 
+extern PARSEINFO parseInfo;
 
 /*
@@ -50 +50 @@
 {
   GTokenValue value;
-  PSYMBOLINFO psi=(PSYMBOLINFO)gScanner->user_data;
 
   /* Line number */
   value=gScanner->value;
-  psi->uiLineCorrection=value.v_int;
+  parseInfo.uiLineCorrection=g_scanner_cur_line(gScanner)-value.v_int+1;
 
   if(!matchNext(G_TOKEN_STRING))
@@ -70 +69 @@
 
   /* Current source file */
-  if(psi->chrCurrentSourceFile)
-    g_free(psi->chrCurrentSourceFile);
+  if(parseInfo.chrCurrentSourceFile)
+    g_free(parseInfo.chrCurrentSourceFile);
 
   value=gScanner->value;
-  psi->chrCurrentSourceFile=g_strdup(value.v_string);
+  parseInfo.chrCurrentSourceFile=g_strdup(value.v_string);
 
   /* Trailing file include level info isn't used for now. Note that for the root