Changeset 265 for trunk/idl-compiler/c/nom-idl-compiler.c

Timestamp:

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

Author:

cinc

Message:

Rewrote symbol handling.

File:

• trunk/idl-compiler/c/nom-idl-compiler.c (modified) (7 diffs)

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

@@ -78 +78 @@
 /* Symbols defined for our IDL language.
    Keep this in synch with the defined enums! */
-const SYMBOL idlSymbols[]={
+SYMBOL idlSymbols[]={
   {"interface", IDL_SYMBOL_INTERFACE, KIND_UNKNOWN}, /* 71 */
   {"NOMCLASSVERSION", IDL_SYMBOL_CLSVERSION, KIND_UNKNOWN},
@@ -103 +103 @@
 SYMBOLINFO curSymbol;
 
+/* Holding the current state of parsing and pointers to necessary lists. */
+PARSEINFO parseInfo={0};
 
 PINTERFACE findInterfaceFromName(gchar* chrName)
@@ -123 +125 @@
   GTokenValue value;
 
-  if(G_TOKEN_IDENTIFIER==curToken)
-    return g_strdup(value.v_identifier);
-  else
-    {
-      /* It's one of our symbols. */
-      PSYMBOLINFO psi;
-
-      if(curToken<=G_TOKEN_LAST)
-        g_scanner_unexp_token(gScanner,
-                              G_TOKEN_SYMBOL,
-                              NULL,
-                              NULL,
-                              NULL,
-                              "Error in NOMINSTANCEVAR()",
-                              TRUE); /* is_error */
-
-      psi=(PSYMBOLINFO)gScanner->user_data;
-      return psi->pSymbols[curToken-G_TOKEN_LAST-1].chrSymbolName;
-    }
+  value=gScanner->value;
+
+  switch(curToken)
+    {
+    case G_TOKEN_IDENTIFIER:
+      return g_strdup(value.v_identifier);
+      break;
+    case G_TOKEN_SYMBOL:
+      {
+        /* It's one of our symbols. */
+        PSYMBOL pCurSymbol;
+
+        pCurSymbol=value.v_symbol;
+        return g_strdup(pCurSymbol->chrSymbolName);
+        break;
+      }
+    default:
+      g_scanner_unexp_token(gScanner,
+                            G_TOKEN_SYMBOL,
+                            NULL,
+                            NULL,
+                            NULL,
+                            "",
+                            TRUE); /* is_error */
+
+      break;
+    }
+  return "unknown";
 }
 
@@ -159 +170 @@
     switch(curToken)
       {
-      case IDL_SYMBOL_INTERFACE:
-        parseInterface(token);
-        break;
       case '#':
         parseHash();
         break;
-
+      case G_TOKEN_SYMBOL:
+        {
+          PSYMBOL pCurSymbol=value.v_symbol;
+          switch(pCurSymbol->uiSymbolToken)
+            {
+            case IDL_SYMBOL_INTERFACE:
+              parseInterface(token);
+              break;
+            default:
+              break;
+            }
+          break;
+        }
 #if 0
       case G_TOKEN_IDENTIFIER:
@@ -226 +246 @@
 }
 
+static gint funcSymbolCompare(gconstpointer a, gconstpointer b)
+{
+  if(a==b)
+    return 0;
+
+  if(a<b)
+    return -1;
+
+  return 1;
+};
 /*
 
@@ -291 +321 @@
   g_printf("\n");
 
+
+
   gScanner=g_scanner_new(NULL);
   gScanner->user_data=(gpointer)&curSymbol;
@@ -306 +338 @@
   g_scanner_set_scope(gScanner, idScope);
   /* Load our own symbols into the scanner. We use the default scope for now. */
+  parseInfo.pSymbolTree=g_tree_new((GCompareFunc) funcSymbolCompare);
   while(pSymbols->chrSymbolName)
     {
-      g_scanner_scope_add_symbol(gScanner, idScope, pSymbols->chrSymbolName, GINT_TO_POINTER(pSymbols->uiSymbolToken));
+      g_scanner_scope_add_symbol(gScanner, idScope, pSymbols->chrSymbolName,
+                                 pSymbols);
+      g_tree_insert(parseInfo.pSymbolTree, pSymbols, pSymbols->chrSymbolName);
       pSymbols++;
     }
-  gScanner->config->symbol_2_token=TRUE;
+  //  gScanner->config->symbol_2_token=TRUE;
 
   parseIt();
 
-  //if(pInterfaceArray->len)
-  //  printInterface();
+  if(pInterfaceArray->len)
+    printInterface();
 
   g_scanner_destroy(gScanner);