resources/RooUsage.txt

[app.Builder.js] / tests / TestCompiler.vala

diff --git a/tests/TestCompiler.vala b/tests/TestCompiler.vala
index f03e987..7c23d11 100644 (file)
--- a/tests/TestCompiler.vala
+++ b/tests/TestCompiler.vala
@@ -1,5 +1,5 @@
 
-// valac TreeBuilder.vala --pkg libvala-0.24 --pkg posix -o /tmp/treebuilder
+// valac TestCompiler.vala --pkg libvala-0.26 --pkg posix -o /tmp/TestCompiler
 
 namespace Palete {
         
@@ -27,7 +27,7 @@ namespace Palete {
                 
                
                
-               public Gee.HashMap<int,string> checkString( )
+               public void checkString( )
                {
                        // init context:
                        var valac = "valac " ;
@@ -68,9 +68,7 @@ namespace Palete {
                        context.thread = true;
                        
                        
-                       this.report = new ValaSourceReport(this.file);
-                       context.report = this.report;
-                       
+                       
                        
                        context.basedir = "/tmp"; //Posix.realpath (".");
                
@@ -93,54 +91,20 @@ namespace Palete {
                        context.add_source_file (source_file);
                        
                // add all the files (except the current one) - this.file.path
-               var pr = ((Project.Gtk)this.file.project);
-               if (this.file.build_module.length > 0) {
-                               var cg =  pr.compilegroups.get(this.file.build_module);
-                               for (var i = 0; i < cg.sources.size; i++) {
-                                       var path = pr.resolve_path(
-                                                       pr.resolve_path_combine_path(pr.firstPath(),cg.sources.get(i)));
-                                                       
-                                       if (!FileUtils.test(path, FileTest.EXISTS)) {
-                                               continue;
-                                       }       
-                        
-                                       if (path == this.file.path.replace(".bjs", ".vala")) {
-                                               valac += " " + path;
-                                               continue;
-                                       }
-                                       if (FileUtils.test(path, FileTest.IS_DIR)) {
-                                               continue;
-                                       }
-                                       //print("Add source file %s\n", path);
-                                       
-                                       valac += " " + path;
-                                       
-                                       if (Regex.match_simple("\\.c$", path)) {
-                                               context.add_c_source_file(path);
-                                               continue;
-                                       }
-                                       
-                                       
-                                       var xsf = new Vala.SourceFile (
-                                               context,
-                                               Vala.SourceFileType.SOURCE, 
-                                               path
-                                       );
-                                       xsf.add_using_directive (ns_ref);
-                                       context.add_source_file(xsf);
-                                       
-                               }
-                       }
+                
                        // default.. packages..
                        context.add_external_package ("glib-2.0"); 
                        context.add_external_package ("gobject-2.0");
-                       // user defined ones..
-                       
-               var dcg = pr.compilegroups.get("_default_");
-               for (var i = 0; i < dcg.packages.size; i++) {
-                               valac += " --pkg " + dcg.packages.get(i);
-                               context.add_external_package (dcg.packages.get(i));
+                       context.add_external_package ("gtk+-3.0");
+                       if (!context.add_external_package ("webkit2gtk-4.0")) {
+                               context.add_external_package ("webkit2gtk-3.0");
                        }
+                       context.add_external_package ("clutter-gtk-1.0");
+                       context.add_external_package ("gdl-3.0");
+                       context.add_external_package ("gtksourceview-3.0");
+                       context.add_external_package ("libvala-0.26");
+                       // user defined ones..
+                        
                
                         //Vala.Config.PACKAGE_SUFFIX.substring (1)
                        
@@ -150,8 +114,7 @@ namespace Palete {
                        
                        //context.add_external_package ("libvala-0.24");
                        
-                       this.report.compile_notice("START", "", 0, "");
-
+                
                
                        //add_documented_files (context, settings.source_files);
                
@@ -160,11 +123,10 @@ namespace Palete {
                        //gir_parser.parse (context);
                        if (context.report.get_errors () > 0) {
                                print("parse got errors");
-                               ((ValaSourceReport)context.report).dump();
-                               
+                                
                                Vala.CodeContext.pop ();
-                               this.report.compile_notice("END", "", 0, "");
-                               return this.report.line_errors;
+                                
+                               return;
                        }
 
 
@@ -172,11 +134,9 @@ namespace Palete {
                        // check context:
                        context.check ();
                        if (context.report.get_errors () > 0) {
-                               print("check got errors");
-                               ((ValaSourceReport)context.report).dump();
-                               Vala.CodeContext.pop ();
-                               this.report.compile_notice("END", "", 0, "");
-                               return this.report.line_errors;
+                                Vala.CodeContext.pop ();
+                                
+                               return ;
                                
                        }
                        
@@ -197,15 +157,17 @@ namespace Palete {
 #endif
                        */
  
+                       
+                       
+                       context.resolver.resolve(new Vala.CodeContext());
+                       context.analyzer.context = null;
+                       context.flow_analyzer.analyze(new Vala.CodeContext());
+                       //context.analyzer = null; << private
                        Vala.CodeContext.pop ();
-                       //(new Vala.CodeNode()).get_error_types().clear();
-                       //(new Vala.NullType()).get_type_arguments().clear();
-                       (new Vala.NullType(null)).get_type_arguments().clear();
-                       parser = null;
-                       this.report.compile_notice("END", "", 0, "");
+                         
                        print("%s\n", valac);
                        print("ALL OK?\n");
-                       return this.report.line_errors;
+                       return ;
                }
        //
                // startpoint:
@@ -213,13 +175,15 @@ namespace Palete {
         
        }
 }
-/*
+ 
 int main (string[] args) {
 
-       var a = new ValaSource(file);
-       a.create_valac_tree();
+       for (var i = 0;i < 1000;i++) {
+               var a = new Palete.TestCompiler("/home/alan/gitlive/app.Builder.js/tests/TestCompiler.vala");
+               a.checkString();
+       }
        return 0;
 }
-*/
+