From bf208ba794742eb4e068e27acd0d86d8bd087942 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Thu, 14 May 2015 15:43:36 +0800 Subject: [PATCH] tests/TestCompiler.vala --- tests/TestCompiler.vala | 84 ++--------------------------------------- 1 file changed, 4 insertions(+), 80 deletions(-) diff --git a/tests/TestCompiler.vala b/tests/TestCompiler.vala index 166a5f288..f4f973d80 100644 --- a/tests/TestCompiler.vala +++ b/tests/TestCompiler.vala @@ -9,6 +9,7 @@ namespace Palete { public class TestCompiler : Vala.CodeVisitor { Vala.CodeContext context; + public TestCompiler(string file) { base(); this.file = file; @@ -22,75 +23,7 @@ namespace Palete { } } - public Gee.HashMap checkFile() - { - return this.checkString(JsRender.NodeToVala.mungeFile(this.file)); - } - - public async Gee.HashMap checkFileWithNodePropChange( - JsRender.Node node, - string prop, - string ptype, - string val) - { - Gee.HashMap ret = new Gee.HashMap (); - 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") { - return ret; - } - - - var old = hash.get(prop); - var newval = "/*--VALACHECK-START--*/ " + val ; - - hash.set(prop, newval); - var tmpstring = JsRender.NodeToVala.mungeFile(this.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.dumpCode(tmpstring); - //print("offset %d\n", offset); - yield this.checkStringThread(tmpstring); - - // modify report - - var iter = this.report.line_errors.map_iterator(); - while (iter.next()) { - // print("%d : %s\n",iter.get_key() - offset, iter.get_value()); - // we have to prefix the error with the fake line number - // so that it's a unique mark.. - ret.set(iter.get_key() - offset, - "%d : %s".printf(iter.get_key() - offset,iter.get_value())); - } - return ret; - - } - - public async Gee.HashMap checkStringThread(string contents) - { - SourceFunc callback = checkStringThread.callback; - var ret = new Gee.HashMap(); - ThreadFunc run = () => { - - // Pass back result and schedule callback - ret = this.checkString(contents); - Idle.add((owned) callback); - return null; - }; - Thread.create(run, false); - - // Wait for background thread to schedule our callback - yield; - return ret; - } - + public Gee.HashMap checkString(string contents) @@ -123,20 +56,11 @@ namespace Palete { - - 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.vapi_directories = vapidirs; context.report.enable_warnings = true; context.metadata_directories = { }; context.gir_directories = {}; -- 2.39.2