Changeset 265 for trunk/idl-compiler/c

Timestamp:

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

Author:

cinc

Message:

Rewrote symbol handling.

Location:

trunk/idl-compiler/c

Files:

• nom-idl-compiler.c (modified) (7 diffs)
• token.c (modified) (8 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);

trunk/idl-compiler/c/token.c

@@ -46 +46 @@
   is e.g. a typespec or just a var name.
  */
-void setSymbolInfo(GTokenType token)
+void setCurSymbolInfo(void)
 {
   PSYMBOLINFO psi;
@@ -52 +52 @@
   psi=(PSYMBOLINFO)gScanner->user_data;
 
-  switch(token)
+  switch(curToken)
     {
     case G_TOKEN_IDENTIFIER:
@@ -61 +61 @@
       break;
     }
-  if(token>G_TOKEN_LAST)
-    {
-      psi->uiCurSymbolKind=psi->pSymbols[token-G_TOKEN_LAST-1].uiKind;
+  if(curToken==G_TOKEN_SYMBOL)
+    {
+      GTokenValue value;
+      PSYMBOL pCurSymbol;
+      
+      value=gScanner->value;
+      pCurSymbol=value.v_symbol;
+
+      psi->uiCurSymbolKind=pCurSymbol->uiKind;
     }
 }
@@ -75 +81 @@
 }
 
-static guint getKindFromTokenType(GTokenType token)
-{
-  if(token>G_TOKEN_LAST)
-    {
-      PSYMBOLINFO psi;
+/* This token is not necessarily the current token! */
+static guint getKindOfNextToken()
+{
+  /* Load info into gScanner */
+  g_scanner_peek_next_token(gScanner);
+
+  if(gScanner->next_token==G_TOKEN_SYMBOL)
+    {
+      GTokenValue value;
+      PSYMBOL pCurSymbol;
+
+      value=gScanner->next_value;
+      pCurSymbol=value.v_symbol;
       
-      psi=(PSYMBOLINFO)gScanner->user_data;
-      return psi->pSymbols[token-G_TOKEN_LAST-1].uiKind;
-    }
-  switch(token)
+      return pCurSymbol->uiKind;
+    }
+  switch(gScanner->next_token)
     {
     case G_TOKEN_IDENTIFIER:
@@ -98 +111 @@
 }
 
+#if 0
 guint queryNextTokensKind(void)
 {
   return getKindFromTokenType(gScanner->next_token);
 }
-
+#endif
 
 /* Well, the name says all... */
@@ -108 +122 @@
 {
   curToken = g_scanner_get_next_token(gScanner);
-  setSymbolInfo(curToken);
+  setCurSymbolInfo();
 }
 
 gboolean matchNextKind(guint uiKind)
 {
-  GTokenType token;
-
-  token=g_scanner_peek_next_token(gScanner);
-  if(uiKind==getKindFromTokenType(token))
+  if(uiKind==getKindOfNextToken())
     {
       getNextToken();
@@ -158 +169 @@
   switch(token)
     {
-    case IDL_SYMBOL_INTERFACE:
-      g_message("Token: %d (IDL_SYMBOL_INTERFACE)\t\t\t (LINE %d)", token, g_scanner_cur_line(gScanner));
-      break;
+    case G_TOKEN_SYMBOL:
+      {
+        PSYMBOL pCurSymbol=value.v_symbol;
+
+        switch(pCurSymbol->uiSymbolToken)
+          {
+          case IDL_SYMBOL_INTERFACE:
+            g_message("Token: %d (IDL_SYMBOL_INTERFACE)\t\t\t (LINE %d)",
+                      pCurSymbol->uiSymbolToken, g_scanner_cur_line(gScanner));
+            break;
+          case IDL_SYMBOL_DEFINE:
+            g_message("Token: %d (IDL_SYMBOL_DEFINE)\t\t\t", pCurSymbol->uiSymbolToken);
+            break;
+          case IDL_SYMBOL_IFDEF:
+            g_message("Token: %d (IDL_SYMBOL_IFDEF)\t\t\t", pCurSymbol->uiSymbolToken);
+            break;
+          case IDL_SYMBOL_ENDIF:
+            g_message("Token: %d (IDL_SYMBOL_ENDIF)\t\t\t", pCurSymbol->uiSymbolToken);
+            break;
+          default:
+            {
+              PSYMBOLINFO psi;
+              psi=(PSYMBOLINFO)gScanner->user_data;         
+            
+              g_message("Token: %d (%s)\t\t\t (LINE %d)", pCurSymbol->uiSymbolToken,
+                        pCurSymbol->chrSymbolName, g_scanner_cur_line(gScanner));
+
+            break;
+            }
+          }/* switch */
+        break;
+      }
     case G_TOKEN_IDENTIFIER:
       g_message("Token: %d (G_TOKEN_IDENTIFIER)\t\t%s (LINE %d)",
@@ -198 +238 @@
       g_message("Token: %d (G_TOKEN_INT)\t\t\t%ld", token, value.v_int);
       break;
-    case IDL_SYMBOL_DEFINE:
-      g_message("Token: %d (IDL_SYMBOL_DEFINE)\t\t\t", token);
-      break;
-    case IDL_SYMBOL_IFDEF:
-      g_message("Token: %d (IDL_SYMBOL_IFDEF)\t\t\t", token);
-      break;
-    case IDL_SYMBOL_ENDIF:
-      g_message("Token: %d (IDL_SYMBOL_ENDIF)\t\t\t", token);
-      break;
     default:
-      {
-        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));
+      {        
+        g_message("Token: %d (---)\t\t\t (LINE %d)", token, g_scanner_cur_line(gScanner));
         break;
       } /* default */