parser: Reduce the source reference of main block method to its beginning

The end contains broken information which lead to a crash while trying to
report this multi-line source reference.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index a7bf1ee45f1861bb29378368c39c20a4ffd192c7..dcc42df06fc15449b8a2cd7e95304ecf9fb9e90c 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -902,6 +902,7 @@ TESTS = \
        parser/local-variable-array-type-invalid.test \
        parser/lock-statement.vala \
        parser/main-block.vala \
+       parser/main-block-minimal.vala \
        parser/member-access-pointer.vala \
        parser/member-initializer.vala \
        parser/member-initializer-empty.vala \

diff --git a/tests/parser/main-block-minimal.c-expected b/tests/parser/main-block-minimal.c-expected
new file mode 100644 (file)
index 0000000..a8b8a94
--- /dev/null
+++ b/tests/parser/main-block-minimal.c-expected
@@ -0,0 +1,21 @@
+/* parser_main_block_minimal.c generated by valac, the Vala compiler
+ * generated from parser_main_block_minimal.vala, do not modify */
+
+#include <glib.h>
+
+static void _vala_main (void);
+
+static void
+_vala_main (void)
+{
+       g_print ("foo");
+}
+
+int
+main (int argc,
+      char ** argv)
+{
+       _vala_main ();
+       return 0;
+}
+

diff --git a/tests/parser/main-block-minimal.vala b/tests/parser/main-block-minimal.vala
new file mode 100644 (file)
index 0000000..d029e43
--- /dev/null
+++ b/tests/parser/main-block-minimal.vala
@@ -0,0 +1 @@
+print ("foo");

diff --git a/vala/valaparser.vala b/vala/valaparser.vala
index 581092de27873ac6e26de2825bbd04efc852f87d..5318bb26517a29e6055dfb83ca5c15abb0e3549a 100644 (file)
--- a/vala/valaparser.vala
+++ b/vala/valaparser.vala
@@ -2517,7 +2517,7 @@ public class Vala.Parser : CodeVisitor {
        void parse_main_block (Symbol parent) throws ParseError {
                var begin = get_location ();
 
-               var method = new Method ("main", new VoidType (), get_src (begin));
+               var method = new Method ("main", new VoidType (), new SourceReference (scanner.source_file, begin, begin));
                method.access = SymbolAccessibility.PUBLIC;
                method.binding = MemberBinding.STATIC;
                method.body = new Block (get_src (begin));