// valac TreeBuilder.vala --pkg libvala-0.24 --pkg posix -o /tmp/treebuilder
+/**
+ *
+ * This just deals with spawning the compiler and getting the results.
+ *
+ * each window should have one of these...
+ *
+ * x = new ValaSource();
+ * x.connect.compiled(... do something with results... );
+ *
+ * x.
+ *
+ */
+
namespace Palete {
public errordomain ValaSourceError {
INVALID_FORMAT
}
- public delegate void ValaSourceResult(Json.Object res);
+ //public delegate void ValaSourceResult(Json.Object res);
- public class ValaSourceReport : Vala.Report {
-
- public string filepath;
-
- public string tmpname;
-
- //public Gee.ArrayList<ValaSourceNotice> notices;
- public Json.Object result;
-
- //public Gee.HashMap<int,string> line_errors;
-
- public void compile_notice(string type, string filename, int line, string message) {
-
- if (!this.result.has_member(type+"-TOTAL")) {
- this.result.set_int_member(type+"-TOTAL", 1);
- } else {
- this.result.set_int_member(type+"-TOTAL",
- this.result.get_int_member(type+"-TOTAL") +1
- );
- }
-
-
- if (!this.result.has_member(type)) {
- this.result.set_object_member(type, new Json.Object());
- }
- var t = this.result.get_object_member(type);
- if (!t.has_member(filename)) {
- t.set_object_member(filename, new Json.Object());
- }
- var tt = t.get_object_member(filename);
- if (!tt.has_member(line.to_string())) {
- tt.set_array_member(line.to_string(), new Json.Array());
- }
- var tl = tt.get_array_member(line.to_string());
- tl.add_string_element(message);
-
- }
-
-
- public ValaSourceReport(string filepath, string tmpname)
- {
- base();
- this.filepath = filepath;
- this.tmpname = tmpname;
- this.result = new Json.Object();
- this.result.set_boolean_member("success", true);
- this.result.set_string_member("message", "");
-
-
-
- //this.line_errors = new Gee.HashMap<int,string> ();
- //this.notices = new Gee.ArrayList<ValaSourceNotice>();
- }
-
- public override void warn (Vala.SourceReference? source, string message) {
-
- if (source == null) {
- return;
- //stderr.printf ("My error: %s\n", message);
- }
-
- if (source.file.filename != this.tmpname) {
- this.compile_notice("WARN", source.file.filename , source.begin.line, message);
- return;
- }
- this.compile_notice("WARN", this.filepath, source.begin.line, message);
-
- }
- public override void depr (Vala.SourceReference? source, string message) {
-
- if (source == null) {
- return;
- //stderr.printf ("My error: %s\n", message);
- }
-
- if (source.file.filename != this.tmpname) {
- this.compile_notice("DEPR", source.file.filename, source.begin.line, message);
- return;
- }
- this.compile_notice("DEPR", this.filepath, source.begin.line, message);
-
- }
-
- public override void err (Vala.SourceReference? source, string message) {
- errors++;
- if (source == null) {
- return;
- //stderr.printf ("My error: %s\n", message);
- }
- if (source.file.filename != this.tmpname) {
- this.compile_notice("ERR", source.file.filename, source.begin.line, message);
- GLib.debug ("Other file: Got error error: %d: %s\n", source.begin.line, message);
- return;
- }
-
-
- this.compile_notice("ERR", this.filepath, source.begin.line, message);
- GLib.debug ("Test file: Got error error: %d: %s\n", source.begin.line, message);
- }
- /*
- public void dump()
- {
- var iter = this.line_errors.map_iterator();
- while (iter.next()) {
- print ("%d : %s\n\n", iter.get_key(), iter.get_value());
- }
- }
- */
-
- }
public class ValaSource : Object {
+
+
+ public signal void compiled(Json.Object res);
- public static void jerr(string str)
- {
- var ret = new Json.Object();
- ret.set_boolean_member("success", false);
- ret.set_string_member("message", str);
-
- var generator = new Json.Generator ();
- var root = new Json.Node(Json.NodeType.OBJECT);
- root.init_object(ret);
- generator.set_root (root);
-
- generator.pretty = true;
- generator.indent = 4;
-
-
- print("%s\n", generator.to_data (null));
- GLib.Process.exit(Posix.EXIT_FAILURE);
-
- }
-
- public static void buildApplication()
- {
- //print("build based on Application settings\n");
-
- if (BuilderApplication.opt_compile_target == null) {
- jerr("missing compile target --target");
- }
-
- Project.Project.loadAll();
- var proj = Project.Project.getProjectByHash(BuilderApplication.opt_compile_project);
-
- if (proj == null) {
- jerr("could not load test project %s".printf( BuilderApplication.opt_compile_project));
- }
-
- if (proj.xtype != "Gtk") {
- jerr("%s is not a Gtk Project".printf( BuilderApplication.opt_compile_project));
- }
- var gproj = (Project.Gtk)proj;
-
-
- if (!gproj.compilegroups.has_key(BuilderApplication.opt_compile_target)) {
- jerr("missing compile target %s".printf(BuilderApplication.opt_compile_target));
- }
- var skip_file = "";
- if (BuilderApplication.opt_compile_skip != null) {
- skip_file = BuilderApplication.opt_compile_skip;
- }
- var add_file = "";
- if (BuilderApplication.opt_compile_add != null) {
- add_file = BuilderApplication.opt_compile_add;
- }
-
-
- var vs = new ValaSource(gproj, add_file, BuilderApplication.opt_compile_target, skip_file);
- vs.compile();
-
-
- }
-
- Vala.CodeContext context;
- ValaSourceReport report;
- Project.Gtk project;
- public string build_module;
- public string filepath;
- public string original_filepath;
- 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) {
+ JsRender.JsRender file;
+ public int line_offset = 0;
+
+ public ValaSource( )
+ {
base();
- //this.file = file;
- this.filepath = filepath;
- this.build_module = build_module;
- this.original_filepath = original_filepath;
- this.project = project;
-
+ this.compiler = null;
}
public void dumpCode(string str)
{
// return this.checkString(JsRender.NodeToVala.mungeFile(this.file));
//}
- public void checkFileWithNodePropChange(
+ public bool checkFileWithNodePropChange(
+
JsRender.JsRender file,
JsRender.Node node,
string prop,
string ptype,
- string val,
- ValaSourceResult result_cb)
+ string val
+ )
{
+ this.file = file;
+
+ if (this.compiler != null) {
+ return false;
+ }
-
-
- 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 ;
+ return false;
}
//this.dumpCode(tmpstring);
//print("offset %d\n", offset);
- this.result_callback = result_cb;
- this.checkStringSpawn(tmpstring );
+ return this.checkStringSpawn(tmpstring );
// modify report
}
Spawn compiler;
- ValaSourceResult result_callback;
- public void checkStringSpawn(
- string contents
- )
+
+ public bool checkStringSpawn(
+ string contents
+ )
{
+ if (this.compiler != null) {
+ return false;
+ }
+
FileIOStream iostream;
var tmpfile = File.new_tmp ("test-XXXXXX.vala", out iostream);
tmpfile.ref();
DataOutputStream dostream = new DataOutputStream (ostream);
dostream.put_string (contents);
+ var valafn = "";
+ try {
+ var regex = new Regex("\\.bjs$");
+
+ valafn = regex.replace(this.file.path,this.file.path.length , 0 , ".vala");
+ } catch (GLib.RegexError e) {
+
+ return false;
+ }
string[] args = {};
- args += FileUtils.read_link("/proc/self/exe");
+ args += BuilderApplication._self;
args += "--project";
- args += this.project.fn;
+ args += this.file.project.fn;
args += "--target";
- args += this.build_module;
+ args += this.file.build_module;
args += "--add-file";
args += tmpfile.get_path();
args += "--skip-file";
- args += this.filepath;
+ args += valafn;
this.compiler = new Spawn("/tmp", args);
+ this.compiler.complete.connect(spawnResult);
try {
- this.compiler.run(spawnResult);
- } 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);
- }
-
- }
- 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();
+ this.compiler.run();
+ } catch (GLib.SpawnError e) {
+ GLib.debug(e.message);
+ this.compiler = null;
+ return false;
- 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();
+ return true;
-
-
}
- public void compile( )
+ public bool checkFileSpawn(JsRender.JsRender file )
{
- // init context:
- var valac = "valac " ;
-
- context = new Vala.CodeContext ();
- Vala.CodeContext.push (context);
-
- context.experimental = false;
- context.experimental_non_null = false;
-
-#if VALA_0_28
- var ver=28;
-#elif VALA_0_26
- var ver=26;
-#elif VALA_0_24
- var ver=24;
-#elif VALA_0_22
- var ver=22;
-#endif
-
- for (int i = 2; i <= ver; i += 2) {
- context.add_define ("VALA_0_%d".printf (i));
+ // race condition..
+ if (this.compiler != null) {
+ return false;
}
-
-
-
-
- var vapidirs = this.project.vapidirs();
+
+ this.file = file;
+ this.line_offset = 0;
+
+ string[] args = {};
+ args += BuilderApplication._self;
+ args += "--project";
+ args += this.file.project.fn;
+ args += "--target";
+ args += this.file.build_module;
- for(var i =0 ; i < context.vapi_directories; i++) {
- vapidirs += context.vapi_directories[i];
- }
-
- for(var i =0 ; i < vapidirs.length; i++) {
- valac += " --vapidir=" + vapidirs[i];
- }
-
-
- context.vapi_directories = vapidirs;
- context.report.enable_warnings = true;
- context.metadata_directories = { };
- context.gir_directories = {};
- context.thread = true;
- this.report = new ValaSourceReport(this.original_filepath, this.filepath);
- context.report = this.report;
+ try {
+ this.compiler = new Spawn("/tmp", args);
+ this.compiler.complete.connect(spawnResult);
- context.basedir = "/tmp"; //Posix.realpath (".");
-
- context.directory = context.basedir;
-
-
- // add default packages:
- //if (settings.profile == "gobject-2.0" || settings.profile == "gobject" || settings.profile == null) {
- context.profile = Vala.Profile.GOBJECT;
-
- var ns_ref = new Vala.UsingDirective (new Vala.UnresolvedSymbol (null, "GLib", null));
- context.root.add_using_directive (ns_ref);
-
- var source_file = new Vala.SourceFile (
- context,
- Vala.SourceFileType.SOURCE,
- this.filepath
- );
- source_file.add_using_directive (ns_ref);
- context.add_source_file (source_file);
+ this.compiler.run();
- // add all the files (except the current one) - this.file.path
- var pr = this.project;
- if (this.build_module.length > 0) {
- var cg = pr.compilegroups.get(this.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;
- }
- // skip thie original
- if (path == this.original_filepath.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);
-
- }
+
+ } catch (GLib.Error e) {
+ GLib.debug(e.message);
+ this.compiler = null;
+ return false;
+ }
+ return true;
+
+ }
+ /**
+ * Used to compile a non builder file..
+ */
+
+ public bool checkPlainFileSpawn( JsRender.JsRender file, string contents )
+ {
+ // race condition..
+ if (this.compiler != null) {
+ return false;
}
- // default.. packages..
- context.add_external_package ("glib-2.0");
- context.add_external_package ("gobject-2.0");
- // user defined ones..
+ var pr = (Project.Gtk)(file.project);
+
+ var m = pr.firstBuildModule();
+ var cg = pr.compilegroups.get(m);
+ var foundit = false;
+ 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 (path == file.path) {
+ foundit = true;
+ break;
+ }
- 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));
}
-
- //Vala.Config.PACKAGE_SUFFIX.substring (1)
-
- // add the modules...
-
-
+ if (!foundit) {
+
+ this.compiler = null;
- //context.add_external_package ("libvala-0.24");
-
-
-
- //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) {
- Vala.CodeContext.pop ();
- GLib.debug("parse got errors");
- //((ValaSourceReport)context.report).dump();
- this.report.result.set_boolean_member("success", false);
- this.report.result.set_string_member("message", "Parse failed");
-
- this.outputResult();
- return;
+ return false; // do not run the compile..
}
+ // is the file in the module?
+
+
+ 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);
- // check context:
- context.check ();
- if (context.report.get_errors () > 0) {
- Vala.CodeContext.pop ();
- GLib.debug("check got errors");
- //((ValaSourceReport)context.report).dump();
- this.report.result.set_boolean_member("success", false);
- this.report.result.set_string_member("message", "Check failed");
-
- this.outputResult();
- return;
- }
+
+ this.file = null;
+ this.line_offset = 0;
+
+ string[] args = {};
+ args += BuilderApplication._self;
+ args += "--project";
+ args += file.project.fn;
+ args += "--target";
+ args += pr.firstBuildModule();
+ args += "--add-file";
+ args += tmpfile.get_path();
+ args += "--skip-file";
+ args += file.path;
+
- //context.codegen = new Vala.GDBusServerModule ();
-
- context.output = "/tmp/testbuild";
- valac += " -o " +context.output;
- //context.codegen.emit (context);
- /*
- var ccompiler = new Vala.CCodeCompiler ();
- var cc_command = Environment.get_variable ("CC");
- var pkg_config_command = Environment.get_variable ("PKG_CONFIG");
-#if VALA_0_28
- ccompiler.compile (context, cc_command, new string[] { }, pkg_config_command);
-#else
- ccompiler.compile (context, cc_command, new string[] { });
-#endif
- */
-
- Vala.CodeContext.pop ();
- this.outputResult();
-
- }
- public void outputResult()
- {
- var generator = new Json.Generator ();
- generator.indent = 1;
- generator.pretty = true;
- var node = new Json.Node(Json.NodeType.OBJECT);
- node.set_object(this.report.result);
-
- generator.set_root(node);
-
- generator.pretty = true;
- generator.indent = 4;
-
-
- print("%s\n", generator.to_data (null));
- GLib.Process.exit(Posix.EXIT_SUCCESS);
+ try {
+ this.compiler = new Spawn("/tmp", args);
+ this.compiler.complete.connect(spawnResult);
+ this.compiler.run();
+ } catch (GLib.Error e) {
+
+ this.compiler = null;
+ return false;
+ }
+ return true;
}
-/*
- public Gee.HashMap<int,string> checkString(string contents)
+ public void spawnResult(int res, string output, string stderr)
{
- // init context:
- var valac = "valac " ;
-
- context = new Vala.CodeContext ();
- Vala.CodeContext.push (context);
-
- context.experimental = false;
- context.experimental_non_null = false;
-
-#if VALA_0_28
- var ver=28;
-#elif VALA_0_26
- var ver=26;
-#elif VALA_0_24
- var ver=24;
-#elif VALA_0_22
- var ver=22;
-#endif
-
- for (int i = 2; i <= ver; i += 2) {
- context.add_define ("VALA_0_%d".printf (i));
- }
-
-
-
-
-
-
-
- var vapidirs = ((Project.Gtk)this.file.project).vapidirs();
- // what's the current version of vala???
-
-
- vapidirs += Path.get_dirname (context.get_vapi_path("glib-2.0")) ;
-
- for(var i =0 ; i < vapidirs.length; i++) {
- valac += " --vapidir=" + vapidirs[i];
- }
+
-
- // or context.get_vapi_path("glib-2.0"); // should return path..
- context.vapi_directories = vapidirs;
- context.report.enable_warnings = true;
- context.metadata_directories = { };
- context.gir_directories = {};
- context.thread = true;
-
-
- this.report = new ValaSourceReport(this.file.path);
- context.report = this.report;
-
-
- context.basedir = "/tmp"; //Posix.realpath (".");
-
- context.directory = context.basedir;
-
-
- // add default packages:
- //if (settings.profile == "gobject-2.0" || settings.profile == "gobject" || settings.profile == null) {
- context.profile = Vala.Profile.GOBJECT;
-
- var ns_ref = new Vala.UsingDirective (new Vala.UnresolvedSymbol (null, "GLib", null));
- context.root.add_using_directive (ns_ref);
+ try {
+ //GLib.debug("GOT output %s", output);
+
+ var pa = new Json.Parser();
+ pa.load_from_data(output);
+ var node = pa.get_root();
- var source_file = new Vala.SourceFile (
- context,
- Vala.SourceFileType.SOURCE,
- "~~~~~testfile.vala",
- contents
- );
- source_file.add_using_directive (ns_ref);
- 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
+ if (node.get_node_type () != Json.NodeType.OBJECT) {
+ var ret = new Json.Object();
+ ret.set_boolean_member("success", false);
+ ret.set_string_member("message",
+ "Compiler returned Unexpected element type %s".printf(
+ node.type_name ()
+ )
);
- xsf.add_using_directive (ns_ref);
- context.add_source_file(xsf);
-
+ this.compiled(ret);
+ this.compiler = null;
}
- }
- // 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));
- }
-
- //Vala.Config.PACKAGE_SUFFIX.substring (1)
-
- // add the modules...
-
-
-
- //context.add_external_package ("libvala-0.24");
-
- this.report.compile_notice("START", "", 0, "");
-
-
- //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");
- ((ValaSourceReport)context.report).dump();
+ var ret = node.get_object ();
+ ret.set_int_member("line_offset", this.line_offset);
- Vala.CodeContext.pop ();
- this.report.compile_notice("END", "", 0, "");
- return this.report.line_errors;
- }
-
-
-
- // 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;
+ this.compiled(ret);
+
+ } catch (GLib.Error e) {
+ var ret = new Json.Object();
+ ret.set_boolean_member("success", false);
+ ret.set_string_member("message", e.message);
+ this.compiled(ret);
}
+ this.compiler = null;
+ //compiler.unref();
+ //tmpfile.unref();
+
- //context.codegen = new Vala.GDBusServerModule ();
-
- context.output = "/tmp/testbuild";
- valac += " -o " +context.output;
- //context.codegen.emit (context);
- odeContext.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;
}
- //
- // startpoint:
- //
- */
}
+
}
/*
int main (string[] args) {
projects / app.Builder.js / blobdiff