Changeset 309 for trunk/idl-compiler/parser_c

Timestamp:

Sep 30, 2007, 8:45:15 PM (18 years ago)

Author:

cinc

Message:

Allow 'foo:override;' for method overriding

Location:

trunk/idl-compiler/parser_c

Files:

• interface_parser.c (modified) (5 diffs)
• override_parser.c (modified) (8 diffs)

trunk/idl-compiler/parser_c/interface_parser.c

@@ -32 +32 @@
 *
 * ***** END LICENSE BLOCK ***** */
+
+/*
+  Main file containing the interface parser. Whenever a valid keyword is found
+  a specialized parser function in another source file is called from here.
+ */
 #include <os2.h>
 #include <stdlib.h>
@@ -113 +118 @@
 /*
   Function to parse the body of an interface declaration.
+  Current token is '{'.
 
   IB:= CV                                             // NOMCLASSVERSION()
@@ -134 +140 @@
     else if(matchNext('#'))
       parseHash();
+    else if(matchNext(G_TOKEN_IDENTIFIER))
+      {
+        /* This may be an override statement */
+        parseOverrideMethodFromIdentifier();
+      }
     else if(matchNext(G_TOKEN_SYMBOL))
       {
@@ -143 +154 @@
         switch(pCurSymbol->uiSymbolToken)
           {
+          case IDL_SYMBOL_OVERRIDE: /* This one is deprecated */
+            parseOverrideMethod();
+            break;
           case IDL_SYMBOL_CLSVERSION:
             parseClassVersion();
-            break;
-          case IDL_SYMBOL_OVERRIDE:
-            parseOverrideMethod();
             break;
           case IDL_SYMBOL_INSTANCEVAR:
@@ -159 +170 @@
             break;
           default:
-            g_scanner_unexp_token(gScanner,
-                                  G_TOKEN_SYMBOL,
-                                  NULL,
-                                  NULL,
-                                  NULL,
-                                  "Trying to parse interface body.",
-                                  TRUE); /* is_error */
-            exit(1);
+            {
+              g_scanner_unexp_token(gScanner,
+                                    G_TOKEN_SYMBOL,
+                                    NULL,
+                                    NULL,
+                                    NULL,
+                                    "Trying to parse interface body.",
+                                    TRUE); /* is_error */
+              exit(1);
+            }
           }/* switch */
       }

trunk/idl-compiler/parser_c/override_parser.c

@@ -38 +38 @@
 
 #include <glib.h> 
+#include <glib/gprintf.h>
 #include "parser.h"
 
@@ -67 +68 @@
 
 /*
-  Parse the class version. Note that the identifier is the current symbol..
+  Parse override. Note that 'NOMOVERRIDE' is the current symbol..
 
   OM:= IDL_SYMBOL_OVERRIDE '(' IDENT ')' ';'
@@ -90 +91 @@
     }
 
+  /* This is the method we actually try to override */
   if(!matchNext(G_TOKEN_IDENTIFIER))
     {
@@ -98 +100 @@
                             NULL,
                             NULL,
-                            "Error in NOMOVERRIDE()",
+                            "Error in NOMOVERRIDE(). Identifier expected.",
                             TRUE); /* is_error */
       exit(1);
@@ -108 +110 @@
   if((pif=findInterfaceForMethod(pParseInfo->pCurInterface, pOMethod->chrName))==NULL)
     {
-
-      g_message("%s:%d: Method '%s' was not introduced by some parent interface.", gScanner->input_name,
-                g_scanner_cur_line(gScanner), pOMethod->chrName);
+      g_printf("%s:%d: error: Method '%s' was not introduced by some parent interface.\n",
+               pParseInfo->chrCurrentSourceFile, g_scanner_cur_line(gScanner)-pParseInfo->uiLineCorrection,
+               pOMethod->chrName);
       exit(1);
     }
@@ -124 +126 @@
                             NULL,
                             NULL,
-                            "Error in NOMOVERRIDE()",
+                            "Error in NOMOVERRIDE(). Closing ')' is missing.",
                             TRUE); /* is_error */
       exit(1);
@@ -136 +138 @@
                             NULL,
                             NULL,
-                            "Error in NOMOVERRIDE()",
+                            "Error in NOMOVERRIDE(). Missing ';' at end of statement.",
                             TRUE); /* is_error */
       exit(1);
@@ -142 +144 @@
   g_ptr_array_add(pParseInfo->pCurInterface->pOverrideArray, (gpointer) pOMethod);
 }
+
+
+/*
+  Parse override. Note that the identifier is the current symbol.
+
+  OM:= IDENT ':' IDL_SYMBOL_OVERRIDE2 ';'
+ */
+void parseOverrideMethodFromIdentifier(void)
+{
+  GTokenValue value;
+  POVERMETHOD pOMethod=g_malloc0(sizeof(OVERMETHOD));
+  PINTERFACE pif;
+
+  /* Keep the current identifier. We need to check for existance later if we find
+     we are in an override statement. */
+  value=gScanner->value;
+  pOMethod->chrName=g_strdup(value.v_identifier);
+
+  if(!matchNext(':'))
+    {
+      getNextToken(); /* Make sure error references the correct token */
+      g_scanner_unexp_token(gScanner,
+                            ':',
+                            NULL,
+                            NULL,
+                            NULL,
+                            "",
+                            TRUE); /* is_error */
+      exit(1);
+    }
+
+  /* Check for 'override' */
+  if(!matchNext(G_TOKEN_SYMBOL))
+    {
+      getNextToken(); /* Make sure error references the correct token */
+      g_scanner_unexp_token(gScanner,
+                            G_TOKEN_SYMBOL,
+                            NULL,
+                            NULL,
+                            NULL,
+                            "'override' keyword expected.",
+                            TRUE); /* is_error */
+      exit(1);
+    }
+  else
+    {
+      /* Check if symbol is 'override' */
+      PSYMBOL pCurSymbol;
+
+      value=gScanner->value;
+      pCurSymbol=value.v_symbol;
+
+      if(pCurSymbol->uiSymbolToken != IDL_SYMBOL_OVERRIDE2)
+        {
+          g_scanner_unexp_token(gScanner,
+                                G_TOKEN_SYMBOL,
+                                NULL,
+                                NULL,
+                                NULL,
+                                "'override' keyword expected after ':'.",
+                                TRUE); /* is_error */
+          exit(1);
+        }
+    }
+  
+  /* Now check if the method was introduced by some parent */
+  if((pif=findInterfaceForMethod(pParseInfo->pCurInterface, pOMethod->chrName))==NULL)
+    {
+      g_printf("%s:%d: error: Method '%s' was not introduced by some parent interface.\n",
+               pParseInfo->chrCurrentSourceFile, g_scanner_cur_line(gScanner)-pParseInfo->uiLineCorrection,
+               pOMethod->chrName);
+      exit(1);
+    }
+
+
+  pOMethod->chrIntroducingIFace=pif->chrName; /* No copy of string here. Nobody should free the
+                                                 interface info under our feet. */
+
+  /* Check for trailing ';' */  
+  if(!matchNext(';'))
+    {
+      getNextToken(); /* Make sure error references the correct token */
+      g_scanner_unexp_token(gScanner,
+                            ';',
+                            NULL,
+                            NULL,
+                            NULL,
+                            "Error in override statement. Trailing ';' is missing.",
+                            TRUE); /* is_error */
+      exit(1);
+    }
+  g_ptr_array_add(pParseInfo->pCurInterface->pOverrideArray, (gpointer) pOMethod);
+}