Fix member access on integer literals, fixes bug 547419

2008-09-27  Jürg Billeter  <j@bitron.ch>

	* vala/valageniescanner.vala:
	* vala/valascanner.vala:

	Fix member access on integer literals, fixes bug 547419

svn path=/trunk/; revision=1800

diff --git a/ChangeLog b/ChangeLog
index 4d0956d13db80aaf74a274dd7abe5221ef4aa45b..95f9ab08682740cd4eadd387b1f25b55338aaafe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-27  Jürg Billeter  <j@bitron.ch>
+
+       * vala/valageniescanner.vala:
+       * vala/valascanner.vala:
+
+       Fix member access on integer literals, fixes bug 547419
+
 2008-09-27  Jürg Billeter  <j@bitron.ch>
 
        * gobject/valaccodeinterfacebinding.vala:

diff --git a/vala/valageniescanner.vala b/vala/valageniescanner.vala
index c889489d64e7bace65c13318f21f1e047b22b844..daade000c8d57d24364514e7926212713419151f 100644 (file)
--- a/vala/valageniescanner.vala
+++ b/vala/valageniescanner.vala
@@ -568,7 +568,7 @@ public class Vala.Genie.Scanner {
                                                current++;
                                        }
                                }
-                       } else if (current < end && current[0] == '.') {
+                       } else if (current < end - 1 && current[0] == '.' && current[1].isdigit ()) {
                                current++;
                                while (current < end && current[0].isdigit ()) {
                                        current++;

diff --git a/vala/valascanner.vala b/vala/valascanner.vala
index 8fa76228626754ba7d8bcf0b1d7a0e8362431871..286290d6974c6f4d2a1b197a9bb3a6c99f9e4f86 100644 (file)
--- a/vala/valascanner.vala
+++ b/vala/valascanner.vala
@@ -361,7 +361,7 @@ public class Vala.Scanner {
                                                current++;
                                        }
                                }
-                       } else if (current < end && current[0] == '.') {
+                       } else if (current < end - 1 && current[0] == '.' && current[1].isdigit ()) {
                                current++;
                                while (current < end && current[0].isdigit ()) {
                                        current++;