Changeset 271 for trunk/idl-compiler/c

Timestamp:

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

Author:

cinc

Message:

Code cleanups.

Location:

trunk/idl-compiler/c

Files:

• nom-idl-compiler.c (modified) (10 diffs)
• printdata.c (modified) (1 diff)
• token.c (modified) (8 diffs)

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

@@ -109 +109 @@
 
 GScanner *gScanner;
-GTokenType curToken=G_TOKEN_EOF;
-PINTERFACE pCurInterface=NULL;
 
 /* Holding info about current token. Referenced by gScanner. */
-SYMBOLINFO curSymbol;
+//SYMBOLINFO curSymbol;
 
 /* Holding the current state of parsing and pointers to necessary lists. */
 PARSEINFO parseInfo={0};
+PPARSEINFO pParseInfo=&parseInfo;
 
 /**
@@ -151 +150 @@
   value=gScanner->value;
 
-  switch(curToken)
+  switch(gScanner->token)
     {
     case G_TOKEN_IDENTIFIER:
@@ -395 +394 @@
     GTokenType token;
 
-    curToken=g_scanner_get_next_token(gScanner);
-    token=curToken;
+    g_scanner_get_next_token(gScanner);
+    token=gScanner->token;
     GTokenValue value=gScanner->value;
     
-    switch(curToken)
+    switch(token)
       {
       case '#':
@@ -465 +464 @@
 #endif
       default:
-        printToken(curToken);
+        printToken(token);
         break;
       }
@@ -535 +534 @@
   /* Vars for filename building */
   char* chrOutputFileName="";
+  char* chrTemp;
 
   GError *gError = NULL;
@@ -557 +557 @@
     a++;
 
-#if 0
   if(!a){
     g_printf("An emitter must be specified.\n\n");
@@ -566 +565 @@
     outputCompilerHelp(gContext, argv[0]);
   }
-#endif
 
   if(strlen(chrOutputName)==0)
@@ -602 +600 @@
     chrOutputFileName=chrOutputName;
 
-  //g_message("Output file: %s", chrOutputFileName);
+  /* Add emitter extension */
+  if(fOptionEmitH)
+    chrTemp=g_strconcat(chrOutputFileName, ".h", NULL);
+  else if(fOptionEmitIH)
+    chrTemp=g_strconcat(chrOutputFileName, ".ih", NULL);
+  else if(fOptionEmitC)
+    chrTemp=g_strconcat(chrOutputFileName, ".c", NULL);
+  g_free(chrOutputFileName);
+  chrOutputFileName=chrTemp;
+
+  g_message("Output file: %s", chrOutputFileName);
 
   /* Open input */
@@ -622 +630 @@
 
   gScanner=g_scanner_new(NULL);
-  gScanner->user_data=(gpointer)&curSymbol;
-  curSymbol.pSymbols=idlSymbols;
+  //gScanner->user_data=(gpointer)&curSymbol;
 
   gScanner->msg_handler=funcMsgHandler;
@@ -650 +657 @@
   parseIt();
 
+  /* Write the output file */
+  if(fOptionEmitH)
+    emitHFile(pInterfaceArray);
+
+#if 0
+  else if(fOptionEmitIH)
+
+  else if(fOptionEmitC)
+    a++;
+
   if(pInterfaceArray->len)
     printInterface();
+#endif
 
   g_scanner_destroy(gScanner);

trunk/idl-compiler/c/printdata.c

@@ -144 +144 @@
       g_printf("\tMinor:\t\t%ld\n", pif->ulMinor);
       g_printf("\tForward decl.:\t%s\n", (pif->fIsForwardDeclaration ? "Yes" : "No"));
-      g_printf("\tMetaclass::\t%s\n", (pif->chrMetaClass ? pif->chrMetaClass : "None"));
+      g_printf("\tMetaclass:\t%s\n", (pif->chrMetaClass ? pif->chrMetaClass : "None"));
+      g_printf("\tSource file:\t%s\n", pif->chrSourceFileName);
       /* Print instance vars */
       g_printf("\tInstance vars:\t%d\n", pif->pInstanceVarArray->len);

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));