X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=blobdiff_plain;f=tests%2FTreeBuilder.vala;h=325a3c7b89fbeea4aa73f5be3a4452e812c2244e;hp=114ece7260e8ba9f69dcacb46e1fda4b75054e70;hb=HEAD;hpb=efdbebda1460966a1eaf29072273e38b3e62b231

diff --git a/tests/TreeBuilder.vala b/tests/TreeBuilder.vala
index 114ece726..325a3c7b8 100644
--- a/tests/TreeBuilder.vala
+++ b/tests/TreeBuilder.vala
@@ -1,104 +1,142 @@
 
 // valac TreeBuilder.vala --pkg libvala-0.24 --pkg posix -o /tmp/treebuilder
 
-public class MyReport  : Vala.Report {
+namespace Palete {
 	
-	public override void err (Vala.SourceReference? source, string message) {
-		errors++;
-		if (source == null) {
-			stderr.printf ("My error: %s\n", message);
-		} else {
-			stderr.printf ("%s: My error: %s\n", source.to_string (), message);
+	public class ValaSourceReport  : Vala.Report {
+
+
 		
-			//Vala.Report.report_source (source);
-			
+
+		Gee.HashMap<int,string> line_errors;
+
+		public ValaSourceReport()
+		{
+			base();
+			this.line_errors = new Gee.HashMap<int,string> ();
+		}
+		
+		public override void err (Vala.SourceReference? source, string message) {
+			errors++;
+			if (source == null) {
+				return;
+				//stderr.printf ("My error: %s\n", message);
+			}
+			if (source.file != "~~~~~testfile.vala") {
+				return;
+			}
+			var pre = "";
+			if (line_errors.has_key(source.begin.line)) {
+				pre = line_errors.get(source.begin.line) + "\n";
+				
+			}
+			line_errors.set(source.begin.line, pre +  message);
 		}
-	}
 	
 
-}
+	}
 
-public class TreeBuilder : Vala.CodeVisitor {
-	
-	public Vala.CodeContext create_valac_tree () {
-		// init context:
-		var context = new Vala.CodeContext ();
-		Vala.CodeContext.push (context);
+	public class ValaSource : Vala.CodeVisitor {
+
+		Vala.CodeContext context;
 		
-		context.experimental = false;
-		context.experimental_non_null = false;
-		context.vapi_directories = { "/usr/share/vala-0.24/vapi" };
-		context.report.enable_warnings = true;
-		context.metadata_directories = { };
-		context.gir_directories = {};
-		context.report = new MyReport();
+		public ValaSource(JsRender.JsRender file) {
+			base();
+			// init context:
+
+			context = new Vala.CodeContext ();
+			Vala.CodeContext.push (context);
+		
+			context.experimental = false;
+			context.experimental_non_null = false;
+			context.vapi_directories = { "/usr/share/vala-0.24/vapi" };
+			context.report.enable_warnings = true;
+			context.metadata_directories = { };
+			context.gir_directories = {};
+			context.report = new ValaSourceReport();
 		
-		context.basedir = Posix.realpath (".");
+			context.basedir = Posix.realpath (".");
 		
-		context.directory = context.basedir;
+			context.directory = context.basedir;
 		
 
-		// add default packages:
-		//if (settings.profile == "gobject-2.0" || settings.profile == "gobject" || settings.profile == null) {
-			context.profile = Vala.Profile.GOBJECT;
-		//	context.add_define ("GOBJECT");
-		//}
-		//add_depencies (context, settings.packages);
-		//if (reporter.errors > 0) {
-		//	return context;
-		//}
-
-		var source_file = new Vala.SourceFile (context, 
-                               Vala.SourceFileType.SOURCE, 
-                               "/home/alan/gitlive/app.Builder.js/tests/TreeBuilder.vala");
-
-		//if (source_package == null) {
-		//source_package = register_package (new Package (settings.pkg_name, false, null));
-		//}
-
-		//register_source_file (source_package, source_file);
-
-		context.add_external_package ("glib-2.0");
-		context.add_external_package ("gobject-2.0");
-		context.add_external_package ("libvala-0.24");
-		//if (context.profile == Vala.Profile.GOBJECT) {
-			// import the GLib namespace by default (namespace of backend-specific standard library)
-			var ns_ref = new Vala.UsingDirective (new Vala.UnresolvedSymbol (null, "GLib", null));
-			source_file.add_using_directive (ns_ref);
-			context.root.add_using_directive (ns_ref);
-		//}
-
-		context.add_source_file (source_file);
+			// add default packages:
+			//if (settings.profile == "gobject-2.0" || settings.profile == "gobject" || settings.profile == null) {
+				context.profile = Vala.Profile.GOBJECT;
+			//	context.add_define ("GOBJECT");
+			//}
+			//add_depencies (context, settings.packages);
+			//if (reporter.errors > 0) {
+			//	return context;
+			//}
+
+			var source_file = new Vala.SourceFile (
+		    		context, 
+		    		Vala.SourceFileType.SOURCE, 
+                                "~~~~~testfile.vala",
+		               NodeToVala.mungeFile(file)
+	    		);
+			//context.add_source_file (testcode);
 
 		
-		//add_documented_files (context, settings.source_files);
-		
-		Vala.Parser parser = new Vala.Parser ();
-		parser.parse (context);
-		//gir_parser.parse (context);
-		if (context.report.get_errors () > 0) {
-			print("got errors");
-			return context;
-		}
+			// source_file = new Vala.SourceFile (context, 
+		        //               Vala.SourceFileType.SOURCE, 
+		        //              "/home/alan/gitlive/app.Builder.js/tests/TreeBuilder.vala");
+
+			//if (source_package == null) {
+			//source_package = register_package (new Package (settings.pkg_name, false, null));
+			//}
 
+			//register_source_file (source_package, source_file);
 
+			context.add_external_package ("glib-2.0");
+			context.add_external_package ("gobject-2.0");
+			context.add_external_package ("libvala-0.24");
+			//context.add_external_package ("posix");
+			//if (context.profile == Vala.Profile.GOBJECT) {
+				// import the GLib namespace by default (namespace of backend-specific standard library)
+				var ns_ref = new Vala.UsingDirective (new Vala.UnresolvedSymbol (null, "GLib", null));
+				source_file.add_using_directive (ns_ref);
+				context.root.add_using_directive (ns_ref);
+			//}
 
-		// check context:
-		context.check ();
-		if (context.report.get_errors () > 0) {
-			return context;
+			context.add_source_file (source_file);
+
+		
+			//add_documented_files (context, settings.source_files);
+		
+			Vala.Parser parser = new Vala.Parser ();
+			parser.parse (context);
+			//gir_parser.parse (context);
+			if (context.report.get_errors () > 0) {
+				print("parse got errors");
+				Vala.CodeContext.pop (context);
+				return;
+			}
+
+
+
+			// check context:
+			context.check ();
+			if (context.report.get_errors () > 0) {
+				print("check got errors");
+				Vala.CodeContext.pop (context);
+				return;
+			}
+			Vala.CodeContext.pop (context);
+			print("ALL OK?\n");
+			return;
 		}
-		return context;
-	}
-//
-	// startpoint:
 	//
- 
+		// startpoint:
+		//
+	 
+	}
 }
 
 int main (string[] args) {
 
-	var a = new TreeBuilder();
+	var a = new ValaSource(file);
 	a.create_valac_tree();
 	return 0;
 }