src/Palete/ValaSoucecCompiler.vala

diff --git a/src/Palete/ValaSoucecCompiler.vala b/src/Palete/ValaSoucecCompiler.vala
index 0234133..5f70c45 100644 (file)
--- a/src/Palete/ValaSoucecCompiler.vala
+++ b/src/Palete/ValaSoucecCompiler.vala
@@ -172,7 +172,7 @@ namespace Palete {
                        }
                        
                        
-                       var vs = new ValaSource(gproj,  add_file, BuilderApplication.opt_compile_target,   skip_file);
+                       var vs = new ValaSourceCompiler(gproj,  add_file, BuilderApplication.opt_compile_target,   skip_file);
                        vs.compile();
                        
                        
@@ -187,7 +187,7 @@ namespace Palete {
                public int line_offset = 0;
                
                // file.project , file.path, file.build_module, ""
-               public ValaSource(Project.Gtk project, string filepath, string build_module, string original_filepath) {
+               public ValaSourceCompiler(Project.Gtk project, string filepath, string build_module, string original_filepath) {
                        base();
                        //this.file = file;
                        this.filepath = filepath;
@@ -204,134 +204,7 @@ namespace Palete {
                        }
                }
                
-               //public Gee.HashMap<int,string> checkFile()
-               //{
-               //      return this.checkString(JsRender.NodeToVala.mungeFile(this.file));
-               //}
-
-               public void checkFileWithNodePropChange(
-                                       JsRender.JsRender file,
-                                       JsRender.Node node, 
-                                       string prop,
-                                       string ptype,
-                                       string val,
-                                       ValaSourceResult result_cb)
-               {
-                       
-                       
-                       
-                       Gee.HashMap<int,string> ret = new Gee.HashMap<int,string> ();
-                       var hash = ptype == "listener" ? node.listeners : node.props;
-                       
-                       // untill we get a smarter renderer..
-                       // we have some scenarios where changing the value does not work
-                       if (prop == "* xns" || prop == "xtype") {
-                               result_callback(new Json.Object());
-                               return ;
-                       }
-                               
-                       
-                       var old = hash.get(prop);
-                       var newval = "/*--VALACHECK-START--*/ " + val ;
-                       
-                       hash.set(prop, newval);
-                       var tmpstring = JsRender.NodeToVala.mungeFile(file);
-                       hash.set(prop, old);
-                       //print("%s\n", tmpstring);
-                       var bits = tmpstring.split("/*--VALACHECK-START--*/");
-                       var offset =0;
-                       if (bits.length > 0) {
-                               offset = bits[0].split("\n").length +1;
-                       }
-                       
-                       this.line_offset = offset;
-                       
-                       //this.dumpCode(tmpstring);
-                       //print("offset %d\n", offset);
-                       this.result_callback = result_cb;
-                       this.checkStringSpawn(tmpstring );
-                       
-                       // modify report
-                       
-                       
-                       
-               }
-               Spawn compiler;
-               ValaSourceResult result_callback;
-               public void checkStringSpawn(
-                                       string contents 
-                               )
-               {
-                       
-                       FileIOStream iostream;
-                       var tmpfile = File.new_tmp ("test-XXXXXX.vala", out iostream);
-                       tmpfile.ref();
-
-                       OutputStream ostream = iostream.output_stream;
-                       DataOutputStream dostream = new DataOutputStream (ostream);
-                       dostream.put_string (contents);
-                       
-                       
-                       string[] args = {};
-                       args += BuilderApplication._self;
-                       args += "--project";
-                       args += this.project.fn;
-                       args += "--target";
-                       args += this.build_module;
-                       args += "--add-file";
-                       args +=  tmpfile.get_path();
-                       args += "--skip-file";
-                       args += this.filepath;
-                       
-                        
-                       
-                       this.compiler = new Spawn("/tmp", args);
-                       
-                       try {
-                               this.compiler.run(spawnResult); 
-                       } catch (GLib.SpawnError e) {
-                               var ret = new Json.Object();
-                               ret.set_boolean_member("success", false);
-                               ret.set_string_member("message", e.message);
-                               this.result_callback(ret);
-                       }
-                        
-               }
-               public void spawnResult(int res, string output, string stderr)
-               {
-                        
-                               
-                       try { 
-                               GLib.debug("GOT output %s", output);
-                               
-                               var pa = new Json.Parser();
-                               pa.load_from_data(output);
-                               var node = pa.get_root();
-
-                               if (node.get_node_type () != Json.NodeType.OBJECT) {
-                                       throw new ValaSourceError.INVALID_FORMAT ("Unexpected element type %s", node.type_name ());
-                               }
-                               var ret = node.get_object ();
-                               ret.set_int_member("line_offset", this.line_offset);
-                               if (result_callback == null) {
-                                       print ("no callback?");
-                                       return;
-                               }
-                               this.result_callback(ret);
-                               
-                               
-                       } catch (Error e) {
-                               var ret = new Json.Object();
-                               ret.set_boolean_member("success", false);
-                               ret.set_string_member("message", e.message);
-                               this.result_callback(ret);
-                       }
-                       //compiler.unref();
-                       //tmpfile.unref();
-                        
-                       
-                       
-               }
+                
                
                public void compile( )
                {