Changeset 271 for trunk/idl-compiler/c/token.c

Timestamp:

Mar 25, 2007, 8:32:59 PM (18 years ago)

Author:

cinc

Message:

Code cleanups.

File:

• trunk/idl-compiler/c/token.c (modified) (8 diffs)

trunk/idl-compiler/c/token.c

@@ -40 +40 @@
 
 extern GScanner *gScanner;
-extern GTokenType curToken;
+extern PPARSEINFO pParseInfo;
 
 /*
@@ -48 +48 @@
 void setCurSymbolInfo(void)
 {
-  PSYMBOLINFO psi;
-
-  psi=(PSYMBOLINFO)gScanner->user_data;
-
-  switch(curToken)
+  switch(gScanner->token)
     {
     case G_TOKEN_IDENTIFIER:
@@ -58 +54 @@
       break;
     default:
-      psi->uiCurSymbolKind=KIND_UNKNOWN;
-      break;
-    }
-  if(curToken==G_TOKEN_SYMBOL)
+      pParseInfo->uiCurSymbolKind=KIND_UNKNOWN;
+      break;
+    }
+  if(gScanner->token==G_TOKEN_SYMBOL)
     {
       GTokenValue value;
@@ -69 +65 @@
       pCurSymbol=value.v_symbol;
 
-      psi->uiCurSymbolKind=pCurSymbol->uiKind;
+      pParseInfo->uiCurSymbolKind=pCurSymbol->uiKind;
     }
 }
@@ -75 +71 @@
 guint queryCurTokensKind(void)
 {
-  PSYMBOLINFO psi;
-
-  psi=(PSYMBOLINFO)gScanner->user_data;
-  return psi->uiCurSymbolKind;
+  return pParseInfo->uiCurSymbolKind;
 }
 
@@ -121 +114 @@
 void getNextToken(void)
 {
-  curToken = g_scanner_get_next_token(gScanner);
+  g_scanner_get_next_token(gScanner);
   setCurSymbolInfo();
 }
@@ -138 +131 @@
 gboolean matchCur(GTokenType token)
 {
-  if(token==curToken)
+  if(token==gScanner->token)
     {
       return TRUE;
@@ -190 +183 @@
           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));