|
From: <jas...@us...> - 2006-07-18 20:48:48
|
Revision: 1516 Author: jasonpmorrison Date: 2006-07-18 13:48:42 -0700 (Tue, 18 Jul 2006) ViewCVS: http://svn.sourceforge.net/rubyeclipse/?rev=1516&view=rev Log Message: ----------- Removed testing code from RubyParserCmd Modified Paths: -------------- branches/type_inferrence/trunk/org.rubypeople.rdt.core.tests/src/RubyParserCmd.java Modified: branches/type_inferrence/trunk/org.rubypeople.rdt.core.tests/src/RubyParserCmd.java =================================================================== --- branches/type_inferrence/trunk/org.rubypeople.rdt.core.tests/src/RubyParserCmd.java 2006-07-18 00:49:09 UTC (rev 1515) +++ branches/type_inferrence/trunk/org.rubypeople.rdt.core.tests/src/RubyParserCmd.java 2006-07-18 20:48:42 UTC (rev 1516) @@ -13,7 +13,6 @@ import org.jruby.ast.Node; import org.jruby.lexer.yacc.SyntaxException; import org.rubypeople.eclipse.shams.resources.ShamFile; -import org.rubypeople.rdt.core.IRubyElement; import org.rubypeople.rdt.internal.core.DefaultWorkingCopyOwner; import org.rubypeople.rdt.internal.core.RubyProject; import org.rubypeople.rdt.internal.core.RubyScript; @@ -21,13 +20,6 @@ import org.rubypeople.rdt.internal.core.RubyScriptStructureBuilder; import org.rubypeople.rdt.internal.core.parser.RdtWarnings; import org.rubypeople.rdt.internal.core.parser.RubyParser; -import org.eclipse.core.resources.IFile; -import org.rubypeople.rdt.internal.ti.BindingVisitor; -//import org.rubypeople.rdt.internal.ti.ScopingVisitor; -import org.rubypeople.rdt.internal.ti.TypeInferenceVisitor; -import org.rubypeople.rdt.internal.ti.data.RubyClass; -import org.rubypeople.rdt.internal.ti.data.RubyCompletionKB; -import org.rubypeople.rdt.internal.ti.data.RubyMethod; public class RubyParserCmd { @@ -85,10 +77,10 @@ System.err.println(fileName); } } -// System.err.println(syntaxErrorFiles.size() + " Errors; " -// + okFiles.size()+" OK"); + System.err.println(syntaxErrorFiles.size() + " Errors; " + + okFiles.size()+" OK"); -// System.err.println("NewElements: " + elements.size()) ; + System.err.println("NewElements: " + elements.size()) ; } private void parseTree(File file) throws FileNotFoundException { @@ -110,31 +102,12 @@ private void parseOneFile(String file) { RubyParser parser = new RubyParser(new RdtWarnings()); try { -// Node node = parser.parse(new ShamFile(file), new FileReader(file)); - Node node = parser.parse("class Foo;def bar(x,y,z);foo=[x,y,z];end;end"); -// RubyScriptElementInfo unitInfo = new RubyScriptElementInfo() ; -// RubyScript script = new RubyScript(new RubyProject(), null, file, DefaultWorkingCopyOwner.PRIMARY ) ; -// RubyScriptStructureBuilder visitor = new RubyScriptStructureBuilder(script, unitInfo, elements); - BindingVisitor nscope_visitor = new BindingVisitor(node); -// TypeInferenceVisitor ti_visitor = new TypeInferenceVisitor(node); - + Node node = parser.parse(new ShamFile(file), new FileReader(file)); + RubyScriptElementInfo unitInfo = new RubyScriptElementInfo() ; + RubyScript script = new RubyScript(new RubyProject(), null, file, DefaultWorkingCopyOwner.PRIMARY ) ; + RubyScriptStructureBuilder visitor = new RubyScriptStructureBuilder(script, unitInfo, elements); if (node != null) { -// ScopingVisitor scoped_visitor = new ScopingVisitor(node); -// node.accept(ti_visitor); - node.accept(nscope_visitor); - System.out.println("done!"); - System.out.println("\nKB Summary:\n"); - - for ( RubyClass klass : RubyCompletionKB.Instance().getClasses() ) - { - System.out.println(klass.getName()); - for ( RubyMethod method : klass.getMethods() ) - { - System.out.println(" " + method.toString()); - } - } - -// node.accept(visitor); + node.accept(visitor); } else { System.out.println("Node is null for : " + file) ; @@ -145,8 +118,7 @@ syntaxErrorFiles.add(file); return ; } catch (Exception e) { - e.printStackTrace(); -// System.out.println(e.getClass().getName() + "->" + e.getMessage()); + System.out.println(e.getClass().getName() + "->" + e.getMessage()); syntaxErrorFiles.add(file); return ; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |