add basic checks for method modifiers, fixes bug 435853 include

2007-05-09  Jürg Billeter  <j@bitron.ch>

	* vala/parser.y: add basic checks for method modifiers, fixes bug 435853
	* vala/vala.h: include valaflagsvalue.h

svn path=/trunk/; revision=312

diff --git a/ChangeLog b/ChangeLog
index 747339b..ce71d3c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-05-09  Jürg Billeter  <j@bitron.ch>
 
+       * vala/parser.y: add basic checks for method modifiers, fixes bug 435853
+       * vala/vala.h: include valaflagsvalue.h
+
+2007-05-09  Jürg Billeter  <j@bitron.ch>
+
        * vala/valanamespace.vala: iterate correctly over string in
          camel_case_to_lower_case method, fixes bug 436760
 

diff --git a/vala/parser.y b/vala/parser.y
index d23076c..95a71ab 100644 (file)
--- a/vala/parser.y
+++ b/vala/parser.y
@@ -2317,7 +2317,9 @@ modifiers
        | modifiers modifier
          {
                if (($1 & $2) == $2) {
-                       /* modifier specified twice, signal error */
+                       ValaSourceReference *src = src(@2);
+                       vala_report_error (src, "Modifier may only be specified once.");
+                       g_object_unref (src);
                }
                $$ = $1 | $2;
          }
@@ -2577,6 +2579,7 @@ method_header
          {
                GList *l;
                ValaSourceReference *src;
+               ValaModifier vmodifiers;
                
                if (!vala_type_reference_get_is_weak ($5)) {
                        vala_type_reference_set_transfers_ownership ($5, TRUE);
@@ -2591,14 +2594,17 @@ method_header
                if (($4 & VALA_MODIFIER_STATIC) == VALA_MODIFIER_STATIC) {
                        vala_method_set_instance ($$, FALSE);
                }
-               if (($4 & VALA_MODIFIER_ABSTRACT) == VALA_MODIFIER_ABSTRACT) {
+               vmodifiers = $4 & (VALA_MODIFIER_ABSTRACT | VALA_MODIFIER_VIRTUAL | VALA_MODIFIER_OVERRIDE);
+               if (vmodifiers == 0) {
+               } else if (vmodifiers == VALA_MODIFIER_ABSTRACT) {
                        vala_method_set_is_abstract ($$, TRUE);
-               }
-               if (($4 & VALA_MODIFIER_VIRTUAL) == VALA_MODIFIER_VIRTUAL) {
+               } else if (vmodifiers == VALA_MODIFIER_VIRTUAL) {
                        vala_method_set_is_virtual ($$, TRUE);
-               }
-               if (($4 & VALA_MODIFIER_OVERRIDE) == VALA_MODIFIER_OVERRIDE) {
+               } else if (vmodifiers == VALA_MODIFIER_OVERRIDE) {
                        vala_method_set_overrides ($$, TRUE);
+               } else {
+                       vala_report_error (vala_code_node_get_source_reference (VALA_CODE_NODE ($$)), "Only one of `abstract', `virtual', and `override' may be specified.");
+                       vala_code_node_set_error (VALA_CODE_NODE ($$), TRUE);
                }
                VALA_CODE_NODE($$)->attributes = $2;
                

diff --git a/vala/vala.h b/vala/vala.h
index 9b66faa..9bdbb3a 100644 (file)
--- a/vala/vala.h
+++ b/vala/vala.h
@@ -29,6 +29,7 @@
 #include <vala/valaexpressionstatement.h>
 #include <vala/valafield.h>
 #include <vala/valaflags.h>
+#include <vala/valaflagsvalue.h>
 #include <vala/valaforeachstatement.h>
 #include <vala/valaformalparameter.h>
 #include <vala/valaforstatement.h>