Changeset 263 for trunk/idl-compiler/parser_c

Timestamp:

Mar 24, 2007, 5:18:50 PM (18 years ago)

Author:

cinc

Message:

Bail out on duplicate method definition. MEthod overriding checks for method.

File:

• trunk/idl-compiler/parser_c/method_parser.c (modified) (4 diffs)

trunk/idl-compiler/parser_c/method_parser.c

@@ -42 +42 @@
 extern PINTERFACE pCurInterface;
 
+/* In override_parser.c */
+extern PINTERFACE findInterfaceForMethod(PINTERFACE pStartInterface, gchar* chrMethodName);
+
 static PMETHOD createMethodStruct()
 {
@@ -146 +149 @@
   GTokenValue value;
   PMETHOD pMethod=createMethodStruct();
-
+  PINTERFACE pif;
   //g_printf("%d: ", __LINE__);
   //printToken(curToken);
@@ -157 +160 @@
     {
       getNextToken(); /* Make sure error references the correct token */
-      printToken(curToken);
       g_scanner_unexp_token(gScanner,
                             G_TOKEN_IDENTIFIER,
@@ -169 +171 @@
   value=gScanner->value;
   pMethod->chrName=g_strdup(value.v_identifier);
+
+  /* Now check if the method was introduced by some parent */
+  if((pif=findInterfaceForMethod(pCurInterface, pMethod->chrName))!=NULL)
+    {
+      gchar* chrMessage;
+      chrMessage=g_strdup_printf("A method '%s' is already present in interface '%s'.",
+                                 pMethod->chrName, pif->chrName);
+
+      g_scanner_unexp_token(gScanner,
+                            G_TOKEN_IDENTIFIER,
+                            NULL,
+                            NULL,
+                            NULL,
+                            chrMessage,
+                            TRUE); /* is_error */
+      exit(1);
+    }
 
   /* Handle parameters  if any */