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

Timestamp:

Mar 25, 2007, 1:07:25 AM (18 years ago)

Author:

cinc

Message:

Getting along with parsing

File:

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

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

@@ -83 +83 @@
   {"NOMINSTANCEVAR", IDL_SYMBOL_INSTANCEVAR, KIND_UNKNOWN},
   {"NOMOVERRIDE", IDL_SYMBOL_OVERRIDE, KIND_UNKNOWN},
+  {"NOMREGISTEREDIFACE", IDL_SYMBOL_REGINTERFACE, KIND_TYPESPEC},
+  {"native", IDL_SYMBOL_NATIVE, KIND_UNKNOWN},
   {"gulong", IDL_SYMBOL_GULONG, KIND_TYPESPEC},
   {"gint", IDL_SYMBOL_GINT, KIND_TYPESPEC},
   {"gpointer", IDL_SYMBOL_GPOINTER, KIND_TYPESPEC},
   {"gboolean", IDL_SYMBOL_GBOOLEAN, KIND_TYPESPEC},
+  {"gchar", IDL_SYMBOL_GCHAR, KIND_TYPESPEC},
+  {"void", IDL_SYMBOL_VOID, KIND_TYPESPEC},
   {"in", IDL_SYMBOL_IN, KIND_DIRECTION},
   {"out", IDL_SYMBOL_OUT, KIND_DIRECTION},
@@ -155 +159 @@
 }
 
+/*
+  The native keyword is used to introduce new types. That's coming
+  from the Corba spec. Maybe we will change that some time.
+
+The current token is the 'native' keyword.
+
+  N:= G_TOKEN_SYMBOL IDENT ';'
+ */
+static void parseNative(void)
+{
+  GTokenValue value;
+  PSYMBOL pCurSymbol=g_malloc0(sizeof(SYMBOL));
+
+  if(!matchNext(G_TOKEN_IDENTIFIER))
+    {
+      PSYMBOL pSymbol;
+
+      /* Check if it's a symbol. The following 'identifier' (word) is maybe alread
+       registered as a symbol. */
+      if(!matchNext(G_TOKEN_SYMBOL))
+        {
+          g_scanner_unexp_token(gScanner,
+                                G_TOKEN_SYMBOL,
+                                NULL,
+                                NULL,
+                                NULL,
+                                "'native' statement is not followed by a valid identifier.",
+                                TRUE); /* is_error */
+          exit(1);
+        }
+      /* It's a symbol. Check if it's a typespec. */
+      value=gScanner->value;
+      pSymbol=value.v_symbol;
+      if(!pSymbol || pSymbol->uiKind!=KIND_TYPESPEC)
+        {
+          g_scanner_unexp_token(gScanner,
+                                G_TOKEN_SYMBOL,
+                                NULL,
+                                NULL,
+                                NULL,
+                                "'native' statement is not followed by a valid symbol.",
+                                TRUE); /* is_error */
+          exit(1);
+        }
+    }
+
+    value=gScanner->value;
+    pCurSymbol->chrSymbolName=g_strdup(value.v_identifier);
+    pCurSymbol->uiKind=KIND_TYPESPEC;
+    pCurSymbol->uiSymbolToken=G_TOKEN_NONE;
+    g_tree_insert(parseInfo.pSymbolTree, pCurSymbol, pCurSymbol->chrSymbolName);
+    g_scanner_scope_add_symbol(gScanner, ID_SCOPE, pCurSymbol->chrSymbolName,
+                             pCurSymbol);
+
+    if(!matchNext(';'))
+      {
+        getNextToken(); /* Make sure error references the correct token */
+        g_scanner_unexp_token(gScanner,
+                              ';',
+                              NULL,
+                              NULL,
+                              NULL,
+                              "Error in 'native' definition , Missing semicolon",
+                              TRUE); /* is_error */
+        exit(1);
+      }
+
+}
 
 /**
@@ -180 +252 @@
             case IDL_SYMBOL_INTERFACE:
               parseInterface(token);
+              break;
+            case IDL_SYMBOL_NATIVE:
+              parseNative();
               break;
             default:
@@ -226 +301 @@
       default:
         printToken(curToken);
-        //  g_message("Token: %d (---)\t\t\t%c (LINE %d)", token, token, g_scanner_cur_line(gScanner));
         break;
       }
@@ -246 +320 @@
 }
 
+/*
+  Compare function for the tree holding our private symbols.
+ */
 static gint funcSymbolCompare(gconstpointer a, gconstpointer b)
 {
@@ -256 +333 @@
   return 1;
 };
+
+void funcMsgHandler(GScanner *gScanner,
+                    gchar *message,
+                    gboolean error)
+{
+
+  g_printf("In file %s, line %d:\n\t%s\n", parseInfo.chrCurrentSourceFile,
+           g_scanner_cur_line(gScanner)-parseInfo.uiLineCorrection, message);
+}
+
 /*
 
@@ -263 +350 @@
   int a;
   int fd;
-  int idScope=0;
+
   GError *gError = NULL;
   GOptionContext* gContext;
@@ -310 +397 @@
 
   /* Create output file name */
-
-  fd=open(argv[1], O_RDONLY);
+  if(!strcmp(argv[1], "-"))
+    fd=0; /* Read from stdin */
+  else
+    fd=open(argv[1], O_RDONLY);
   
   if(-1==fd)
@@ -327 +416 @@
   curSymbol.pSymbols=idlSymbols;
 
+  gScanner->msg_handler=funcMsgHandler;
   pInterfaceArray=g_ptr_array_new();
 
@@ -336 +426 @@
   gScanner->input_name=IDL_COMPILER_STRING;
 
-  g_scanner_set_scope(gScanner, idScope);
+  g_scanner_set_scope(gScanner, ID_SCOPE);
   /* 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,
+#warning !!! Create a copy here so it is the same as with new symbols added later.
+      g_scanner_scope_add_symbol(gScanner, ID_SCOPE, pSymbols->chrSymbolName,
                                  pSymbols);
       g_tree_insert(parseInfo.pSymbolTree, pSymbols, pSymbols->chrSymbolName);
@@ -371 +462 @@
 
 #endif
+
+
+
+
+
+
+
+
+