report too short type names, based on patch by Ed Schouten, fixes bug

2007-08-29  Juerg Billeter  <j@bitron.ch>

	* gobject/valacodegeneratorclass.vala,
	  gobject/valacodegeneratorinterface.vala: report too short type names,
	  based on patch by Ed Schouten, fixes bug 471253

svn path=/trunk/; revision=531

diff --git a/ChangeLog b/ChangeLog
index 766d3fb..2fa042a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-08-29  Jürg Billeter  <j@bitron.ch>
 
+       * gobject/valacodegeneratorclass.vala,
+         gobject/valacodegeneratorinterface.vala: report too short type names,
+         based on patch by Ed Schouten, fixes bug 471253
+
+2007-08-29  Jürg Billeter  <j@bitron.ch>
+
        * vala/parser.y: allow property accessors in arbitrary order,
          fixes bug 470233
 

diff --git a/gobject/valacodegeneratorclass.vala b/gobject/valacodegeneratorclass.vala
index 53fc7a8..a8033d9 100644 (file)
--- a/gobject/valacodegeneratorclass.vala
+++ b/gobject/valacodegeneratorclass.vala
@@ -39,6 +39,12 @@ public class Vala.CodeGenerator {
                current_type_symbol = cl;
                current_class = cl;
 
+               if (cl.get_cname().len () < 3) {
+                       cl.error = true;
+                       Report.error (cl.source_reference, "Class name `%s' is too short".printf (cl.get_cname ()));
+                       return;
+               }
+
                if (cl.is_static) {
                        return;
                }

diff --git a/gobject/valacodegeneratorinterface.vala b/gobject/valacodegeneratorinterface.vala
index aa98235..2731002 100644 (file)
--- a/gobject/valacodegeneratorinterface.vala
+++ b/gobject/valacodegeneratorinterface.vala
@@ -28,6 +28,12 @@ public class Vala.CodeGenerator {
                current_symbol = iface;
                current_type_symbol = iface;
 
+               if (iface.get_cname().len () < 3) {
+                       iface.error = true;
+                       Report.error (iface.source_reference, "Interface name `%s' is too short".printf (iface.get_cname ()));
+                       return;
+               }
+
                CCodeFragment decl_frag;
                CCodeFragment def_frag;
                if (iface.access != MemberAccessibility.PRIVATE) {