Changeset 264 for trunk/idl-compiler/c

Timestamp:

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

Author:

cinc

Message:

More code...

Location:

trunk/idl-compiler/c

Files:

• nom-idl-compiler.c (modified) (3 diffs)
• token.c (modified) (3 diffs)

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 */
+}