From 76652d25b7d2fe79341f6c836d906fde679479fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Murias?= Date: Mon, 24 Sep 2018 18:55:47 +0200 Subject: [PATCH] [truffle] Remove a bunch of debugging print statements --- src/vm/jvm/Truffle.nqp | 1 - .../jvm/runtime/org/perl6/nqp/truffle/ManageScopes.java | 1 - .../nqp/truffle/nodes/expression/NQPDeserializeNode.java | 5 ----- .../truffle/nodes/expression/NQPLoadbytecodeNode.java | 3 --- .../org/perl6/nqp/truffle/runtime/DynamicContext.java | 5 +---- src/vm/truffle/ModuleLoader.nqp | 9 --------- 6 files changed, 1 insertion(+), 23 deletions(-) diff --git a/src/vm/jvm/Truffle.nqp b/src/vm/jvm/Truffle.nqp index 3dccab614f..90f681b8dd 100644 --- a/src/vm/jvm/Truffle.nqp +++ b/src/vm/jvm/Truffle.nqp @@ -1073,7 +1073,6 @@ class QAST::TruffleCompiler does SerializeOnce { if $node.scope eq 'lexical' && self.is_dynamic_var($node) { if $node.decl eq 'var' { - nqp::say("declaring a dynamic variable"); # TODO avoid double binds @*DECLARATIONS.push(["dynamic-bind-direct", $node.name, ["null"]]); } diff --git a/src/vm/jvm/runtime/org/perl6/nqp/truffle/ManageScopes.java b/src/vm/jvm/runtime/org/perl6/nqp/truffle/ManageScopes.java index 962c909212..3765987923 100644 --- a/src/vm/jvm/runtime/org/perl6/nqp/truffle/ManageScopes.java +++ b/src/vm/jvm/runtime/org/perl6/nqp/truffle/ManageScopes.java @@ -83,7 +83,6 @@ public static NQPNode createBlock(NQPScope scope, String cuid, NQPNode[] childre FrameDescriptor frameDescriptor = ((NQPScopeWithFrame) scope).getFrameDescriptor(); RootNode rootNode = new NQPRootNode(null, frameDescriptor, new NQPBlockBodyNode(children)); NQPCodeRef code = new NQPCodeRef(rootNode, null); - System.out.println("adding cuids"); scope.addCuid(cuid, code); return new NQPStaticBlockNode(code); } diff --git a/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/expression/NQPDeserializeNode.java b/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/expression/NQPDeserializeNode.java index 277404129c..c116bc1357 100644 --- a/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/expression/NQPDeserializeNode.java +++ b/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/expression/NQPDeserializeNode.java @@ -47,23 +47,18 @@ public String executeStr(VirtualFrame frame) { NQPList crList = (NQPList) crNode.execute(frame); Object conflict = conflictNode.execute(frame); - System.out.println("deserializing"); ByteBuffer binaryBlob = Base64.decode(blob); - String[] sh = new String[shList.elems()]; for (int i = 0; i < shList.elems(); i++) { sh[i] = shList.atposStr(i); } - System.out.println("got code refs: " + crList.elems()); - NQPCodeRef[] cr = new NQPCodeRef[crList.elems()]; for (int i = 0; i < crList.elems(); i++) { cr[i] = (NQPCodeRef) crList.atpos(i); } - SerializationReader sr = new SerializationReader(sc, sh, cr, binaryBlob, scs); sr.deserialize(); diff --git a/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/expression/NQPLoadbytecodeNode.java b/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/expression/NQPLoadbytecodeNode.java index 3afdeb60c6..b408432b07 100644 --- a/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/expression/NQPLoadbytecodeNode.java +++ b/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/expression/NQPLoadbytecodeNode.java @@ -33,12 +33,9 @@ public static NQPLoadbytecodeNode deserialize(NQPScope scope, NQPNode argNode) { public String executeStr(VirtualFrame frame) { String fileName = argNode.executeStr(frame); - System.out.println("loadbytecode " + fileName); - File file = new File(fileName); if (!file.exists() && fileName.equals("ModuleLoader.truffle6")) { /* We special case the initial ModuleLoader loading. */ - System.out.println("We have the initial ModuleLoader"); fileName = "gen/truffle/stage1/" + fileName; } diff --git a/src/vm/jvm/runtime/org/perl6/nqp/truffle/runtime/DynamicContext.java b/src/vm/jvm/runtime/org/perl6/nqp/truffle/runtime/DynamicContext.java index c5760bf1c0..841b3838d2 100644 --- a/src/vm/jvm/runtime/org/perl6/nqp/truffle/runtime/DynamicContext.java +++ b/src/vm/jvm/runtime/org/perl6/nqp/truffle/runtime/DynamicContext.java @@ -15,7 +15,6 @@ public DynamicContext(DynamicContext outer) { } public Object lookup(String name) { - System.out.println("looking up dynamic variable " + name); if (contents.containsKey(name)) { return contents.get(name); } else { @@ -34,10 +33,9 @@ public void bind(String name, Object value) { if (outer != null) { this.outer.bind(name, value); } else { - System.out.println("Can't bind " + name); + throw new RuntimeException("Can't bind " + name); } } - System.out.println("binding dynamic variable " + name + " = " + value); } public void bindDirect(String name, Object value) { @@ -45,7 +43,6 @@ public void bindDirect(String name, Object value) { } public Object lookupDirect(String name) { - System.out.println("looking up dynamic variable direct: " + name); return contents.get(name); } } diff --git a/src/vm/truffle/ModuleLoader.nqp b/src/vm/truffle/ModuleLoader.nqp index d4a27eed05..f9707ff8d4 100644 --- a/src/vm/truffle/ModuleLoader.nqp +++ b/src/vm/truffle/ModuleLoader.nqp @@ -34,7 +34,6 @@ knowhow ModuleLoader { } method ctxsave($ctx) { - nqp::say('in ctxsave'); $*MAIN_CTX := $ctx; $*CTXSAVE := 0; } @@ -61,8 +60,6 @@ knowhow ModuleLoader { } } - nqp::say("we have path: $path"); - if nqp::existskey(%modules_loaded, $path) { $module_ctx := %modules_loaded{$path}; } @@ -165,18 +162,13 @@ knowhow ModuleLoader { } method load_setting($setting_name) { - nqp::say('here we loading setting'); my $setting; if $setting_name ne 'NULL' { # Add path prefix and .setting suffix. my $path := "$setting_name.setting"; - nqp::say('#1'); my @prefixes := self.search_path('setting-path'); - nqp::say('#2'); for @prefixes -> $prefix { - nqp::say("checking $prefix"); - nqp::say("trying out :" ~ "$prefix/$path.truffle6"); if nqp::stat("$prefix/$path.truffle6", 0) { $path := "$prefix/$path.truffle6"; #last; @@ -190,7 +182,6 @@ knowhow ModuleLoader { #last; } } - nqp::say('#3'); # Unless we already did so, load the setting. unless nqp::existskey(%settings_loaded, $path) {