Changeset 269 for trunk/idl-compiler/parser_c

Timestamp:

Mar 25, 2007, 2:35:35 PM (18 years ago)

Author:

cinc

Message:

IDL file parsing more or less working.

Location:

trunk/idl-compiler/parser_c

Files:

• interface_parser.c (modified) (2 diffs)
• method_parser.c (modified) (1 diff)
• typespec_parser.c (modified) (2 diffs)

trunk/idl-compiler/parser_c/interface_parser.c

@@ -63 +63 @@
   g_scanner_scope_add_symbol(gScanner, ID_SCOPE, pNewSymbol->chrSymbolName,
                              pNewSymbol);
+  /* For legacy support and convenience we automatically register a pointer type
+     to the interface. */
+  pNewSymbol=g_malloc0(sizeof(SYMBOL));
+  pNewSymbol->uiKind=KIND_TYPESPEC;
+  pNewSymbol->uiSymbolToken=IDL_SYMBOL_REGINTERFACE;
+  pNewSymbol->chrSymbolName=g_strconcat("P", pCurInterface->chrName, NULL);
+  g_message("%s: %s", __FUNCTION__, pNewSymbol->chrSymbolName);
+  g_tree_insert(parseInfo.pSymbolTree, pNewSymbol, pNewSymbol->chrSymbolName);
+  g_scanner_scope_add_symbol(gScanner, ID_SCOPE, pNewSymbol->chrSymbolName,
+                             pNewSymbol);
 }
 
@@ -98 +108 @@
         parseMethod();
       }
+    else if(matchNext('#'))
+      parseHash();
     else if(matchNext(G_TOKEN_SYMBOL))
       {

trunk/idl-compiler/parser_c/method_parser.c

@@ -119 +119 @@
 
     //pParam->chrType=getTypeSpecStringFromCurToken();
+    //g_printf("%s %d", __FUNCTION__, __LINE__);
+    //printToken(curToken);
 
     if(!matchNext(G_TOKEN_IDENTIFIER))
       {
         getNextToken(); /* Make sure error references the correct token */
+        //g_printf("%s %d", __FUNCTION__, __LINE__);
+        //printToken(curToken);
         g_scanner_unexp_token(gScanner,
                               G_TOKEN_IDENTIFIER,

trunk/idl-compiler/parser_c/typespec_parser.c

@@ -47 +47 @@
 
   TS:= TYPE_SPEC
+    |  TYPE_SPEC TYPE_SPEC      // This is for something like 'unsigned long'
     |  TYPE_SPEC '*'
+    |  TYPE_SPEC TYPE_SPEC '*'  // This is for something like 'unsigned long*'
 */
 void parseTypeSpec(PMETHODPARAM pMethodParam)
 {
-  /* Return type  */
-  pMethodParam->chrType=getTypeSpecStringFromCurToken();
+  char *chrTemp;
+
+  /* Return type part 1 */
+  chrTemp=getTypeSpecStringFromCurToken();
+
+  /* A second typespec part (e.g. 'unsigned long')? */
+  if(matchNextKind(KIND_TYPESPEC))
+    {
+      char *chrTemp2=getTypeSpecStringFromCurToken();
+      pMethodParam->chrType=g_strconcat(chrTemp, " ", chrTemp2 ,NULL);
+      g_free(chrTemp2);
+      g_free(chrTemp);
+    }
+  else{
+    /* Return type  */
+    pMethodParam->chrType=chrTemp;
+  }
 
   /* Do we return a pointer (check for '*') */
@@ -61 +78 @@
 
 
+
+