vala r1207 - in trunk: . vala

[juergbi svn gnome org]

Author: juergbi
Date: Sun Apr 13 16:06:51 2008
New Revision: 1207
URL: http://svn.gnome.org/viewvc/vala?rev=1207&view=rev

Log:
2008-04-13  Juerg Billeter  <j bitron ch>

	* vala/valaparser.vala: report warning when using deprecated syntax
	  for property default values

	* vala/valaconstructor.vala, vala/valaenum.vala: port to new syntax


Modified:
   trunk/ChangeLog
   trunk/vala/valaconstructor.vala
   trunk/vala/valaenum.vala
   trunk/vala/valaparser.vala

Modified: trunk/vala/valaconstructor.vala
==============================================================================
--- trunk/vala/valaconstructor.vala	(original)
+++ trunk/vala/valaconstructor.vala	Sun Apr 13 16:06:51 2008
@@ -39,7 +39,7 @@
 	/**
 	 * Specifies whether this is an instance or a class constructor.
 	 */
-	public bool instance { get; set; default (true); }
+	public bool instance { get; set; default = true; }
 	
 	/**
 	 * Creates a new constructor.

Modified: trunk/vala/valaenum.vala
==============================================================================
--- trunk/vala/valaenum.vala	(original)
+++ trunk/vala/valaenum.vala	Sun Apr 13 16:06:51 2008
@@ -35,7 +35,7 @@
 	/**
 	 * Specifies whether this enum has a registered GType.
 	 */
-	public bool has_type_id { get; set; default (true); }
+	public bool has_type_id { get; set; default = true; }
 
 	private Gee.List<EnumValue> values = new ArrayList<EnumValue> ();
 	private Gee.List<Method> methods = new ArrayList<Method> ();

Modified: trunk/vala/valaparser.vala
==============================================================================
--- trunk/vala/valaparser.vala	(original)
+++ trunk/vala/valaparser.vala	Sun Apr 13 16:06:51 2008
@@ -149,6 +149,16 @@
 		return src;
 	}
 
+	SourceReference get_current_src () {
+		return new SourceReference (scanner.source_file, tokens[index].begin.line, tokens[index].begin.column, tokens[index].end.line, tokens[index].end.column);
+	}
+
+	SourceReference get_last_src () {
+		int last_index = (index + BUFFER_SIZE - 1) % BUFFER_SIZE;
+
+		return new SourceReference (scanner.source_file, tokens[last_index].begin.line, tokens[last_index].begin.column, tokens[last_index].end.line, tokens[last_index].end.column);
+	}
+
 	void rollback (SourceLocation location) {
 		while (tokens[index].begin.pos != location.pos) {
 			prev ();
@@ -1199,7 +1209,7 @@
 			}
 		}
 		if (!accept (TokenType.CLOSE_BRACE)) {
-			Report.error (new SourceReference (scanner.source_file, tokens[index].begin.line, tokens[index].begin.column, tokens[index].end.line, tokens[index].end.column), "expected `}'");
+			Report.error (get_current_src (), "expected `}'");
 		}
 
 		return block;
@@ -1626,7 +1636,7 @@
 		}
 		if (!root) {
 			if (!accept (TokenType.CLOSE_BRACE)) {
-				Report.error (new SourceReference (scanner.source_file, tokens[index].begin.line, tokens[index].begin.column, tokens[index].end.line, tokens[index].end.column), "expected `}'");
+				Report.error (get_current_src (), "expected `}'");
 			}
 		}
 	}
@@ -2054,7 +2064,7 @@
 					throw new ParseError.SYNTAX (get_error ("property default value already defined"));
 				}
 				if (accept (TokenType.OPEN_PARENS)) {
-					// deprecated
+					Report.warning (get_last_src (), "deprecated syntax, use `default = value;`");
 					prop.default_expression = parse_expression ();
 					expect (TokenType.CLOSE_PARENS);
 				} else {