Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d5e5b2b1b858
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e0f5e82bcbfd
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Jan 3, 2016

  1. [Truffle] Remove DATA stuff from the SVM entry point.

    @chrisseaton
    chrisseaton committed Jan 3, 2016
    Copy the full SHA
    288efcb View commit details

  2. Interface methods are always public.

    @chrisseaton
    chrisseaton committed Jan 3, 2016
    Copy the full SHA
    70a93cd View commit details

  3. [Truffle] Findbugs.

    @chrisseaton
    chrisseaton committed Jan 3, 2016
    Copy the full SHA
    e0f5e82 View commit details
212 changes: 106 additions & 106 deletions core/src/main/java/org/jruby/ast/visitor/NodeVisitor.java
View file
Original file line number Diff line number Diff line change
@@ -41,110 +41,110 @@
* @author Benoit Cerrina
**/
public interface NodeVisitor<T> {
public T visitAliasNode(AliasNode iVisited);
public T visitAndNode(AndNode iVisited);
public T visitArgsNode(ArgsNode iVisited);
public T visitArgsCatNode(ArgsCatNode iVisited);
public T visitArgsPushNode(ArgsPushNode iVisited);
public T visitArgumentNode(ArgumentNode iVisited);
public T visitArrayNode(ArrayNode iVisited);
public T visitAttrAssignNode(AttrAssignNode iVisited);
public T visitBackRefNode(BackRefNode iVisited);
public T visitBeginNode(BeginNode iVisited);
public T visitBignumNode(BignumNode iVisited);
public T visitBlockArgNode(BlockArgNode iVisited);
public T visitBlockNode(BlockNode iVisited);
public T visitBlockPassNode(BlockPassNode iVisited);
public T visitBreakNode(BreakNode iVisited);
public T visitConstDeclNode(ConstDeclNode iVisited);
public T visitClassVarAsgnNode(ClassVarAsgnNode iVisited);
public T visitClassVarDeclNode(ClassVarDeclNode iVisited);
public T visitClassVarNode(ClassVarNode iVisited);
public T visitCallNode(CallNode iVisited);
public T visitCaseNode(CaseNode iVisited);
public T visitClassNode(ClassNode iVisited);
public T visitColon2Node(Colon2Node iVisited);
public T visitColon3Node(Colon3Node iVisited);
public T visitComplexNode(ComplexNode iVisited);
public T visitConstNode(ConstNode iVisited);
public T visitDAsgnNode(DAsgnNode iVisited);
public T visitDRegxNode(DRegexpNode iVisited);
public T visitDStrNode(DStrNode iVisited);
public T visitDSymbolNode(DSymbolNode iVisited);
public T visitDVarNode(DVarNode iVisited);
public T visitDXStrNode(DXStrNode iVisited);
public T visitDefinedNode(DefinedNode iVisited);
public T visitDefnNode(DefnNode iVisited);
public T visitDefsNode(DefsNode iVisited);
public T visitDotNode(DotNode iVisited);
public T visitEncodingNode(EncodingNode iVisited);
public T visitEnsureNode(EnsureNode iVisited);
public T visitEvStrNode(EvStrNode iVisited);
public T visitFCallNode(FCallNode iVisited);
public T visitFalseNode(FalseNode iVisited);
public T visitFixnumNode(FixnumNode iVisited);
public T visitFlipNode(FlipNode iVisited);
public T visitFloatNode(FloatNode iVisited);
public T visitForNode(ForNode iVisited);
public T visitGlobalAsgnNode(GlobalAsgnNode iVisited);
public T visitGlobalVarNode(GlobalVarNode iVisited);
public T visitHashNode(HashNode iVisited);
public T visitInstAsgnNode(InstAsgnNode iVisited);
public T visitInstVarNode(InstVarNode iVisited);
public T visitIfNode(IfNode iVisited);
public T visitIterNode(IterNode iVisited);
public T visitKeywordArgNode(KeywordArgNode iVisited);
public T visitKeywordRestArgNode(KeywordRestArgNode iVisited);
public T visitLambdaNode(LambdaNode iVisited);
public T visitListNode(ListNode iVisited);
public T visitLiteralNode(LiteralNode iVisited);
public T visitLocalAsgnNode(LocalAsgnNode iVisited);
public T visitLocalVarNode(LocalVarNode iVisited);
public T visitMultipleAsgnNode(MultipleAsgnNode iVisited);
public T visitMatch2Node(Match2Node iVisited);
public T visitMatch3Node(Match3Node iVisited);
public T visitMatchNode(MatchNode iVisited);
public T visitModuleNode(ModuleNode iVisited);
public T visitNewlineNode(NewlineNode iVisited);
public T visitNextNode(NextNode iVisited);
public T visitNilNode(NilNode iVisited);
public T visitNthRefNode(NthRefNode iVisited);
public T visitOpElementAsgnNode(OpElementAsgnNode iVisited);
public T visitOpAsgnNode(OpAsgnNode iVisited);
public T visitOpAsgnAndNode(OpAsgnAndNode iVisited);
public T visitOpAsgnOrNode(OpAsgnOrNode iVisited);
public T visitOptArgNode(OptArgNode iVisited);
public T visitOrNode(OrNode iVisited);
public T visitPreExeNode(PreExeNode iVisited);
public T visitPostExeNode(PostExeNode iVisited);
public T visitRationalNode(RationalNode iVisited);
public T visitRedoNode(RedoNode iVisited);
public T visitRegexpNode(RegexpNode iVisited);
public T visitRequiredKeywordArgumentValueNode(RequiredKeywordArgumentValueNode iVisited);
public T visitRescueBodyNode(RescueBodyNode iVisited);
public T visitRescueNode(RescueNode iVisited);
public T visitRestArgNode(RestArgNode iVisited);
public T visitRetryNode(RetryNode iVisited);
public T visitReturnNode(ReturnNode iVisited);
public T visitRootNode(RootNode iVisited);
public T visitSClassNode(SClassNode iVisited);
public T visitSelfNode(SelfNode iVisited);
public T visitSplatNode(SplatNode iVisited);
public T visitStarNode(StarNode iVisited);
public T visitStrNode(StrNode iVisited);
public T visitSuperNode(SuperNode iVisited);
public T visitSValueNode(SValueNode iVisited);
public T visitSymbolNode(SymbolNode iVisited);
public T visitTrueNode(TrueNode iVisited);
public T visitUndefNode(UndefNode iVisited);
public T visitUntilNode(UntilNode iVisited);
public T visitVAliasNode(VAliasNode iVisited);
public T visitVCallNode(VCallNode iVisited);
public T visitWhenNode(WhenNode iVisited);
public T visitWhileNode(WhileNode iVisited);
public T visitXStrNode(XStrNode iVisited);
public T visitYieldNode(YieldNode iVisited);
public T visitZArrayNode(ZArrayNode iVisited);
public T visitZSuperNode(ZSuperNode iVisited);
public T visitOther(Node iVisited);
T visitAliasNode(AliasNode iVisited);
T visitAndNode(AndNode iVisited);
T visitArgsNode(ArgsNode iVisited);
T visitArgsCatNode(ArgsCatNode iVisited);
T visitArgsPushNode(ArgsPushNode iVisited);
T visitArgumentNode(ArgumentNode iVisited);
T visitArrayNode(ArrayNode iVisited);
T visitAttrAssignNode(AttrAssignNode iVisited);
T visitBackRefNode(BackRefNode iVisited);
T visitBeginNode(BeginNode iVisited);
T visitBignumNode(BignumNode iVisited);
T visitBlockArgNode(BlockArgNode iVisited);
T visitBlockNode(BlockNode iVisited);
T visitBlockPassNode(BlockPassNode iVisited);
T visitBreakNode(BreakNode iVisited);
T visitConstDeclNode(ConstDeclNode iVisited);
T visitClassVarAsgnNode(ClassVarAsgnNode iVisited);
T visitClassVarDeclNode(ClassVarDeclNode iVisited);
T visitClassVarNode(ClassVarNode iVisited);
T visitCallNode(CallNode iVisited);
T visitCaseNode(CaseNode iVisited);
T visitClassNode(ClassNode iVisited);
T visitColon2Node(Colon2Node iVisited);
T visitColon3Node(Colon3Node iVisited);
T visitComplexNode(ComplexNode iVisited);
T visitConstNode(ConstNode iVisited);
T visitDAsgnNode(DAsgnNode iVisited);
T visitDRegxNode(DRegexpNode iVisited);
T visitDStrNode(DStrNode iVisited);
T visitDSymbolNode(DSymbolNode iVisited);
T visitDVarNode(DVarNode iVisited);
T visitDXStrNode(DXStrNode iVisited);
T visitDefinedNode(DefinedNode iVisited);
T visitDefnNode(DefnNode iVisited);
T visitDefsNode(DefsNode iVisited);
T visitDotNode(DotNode iVisited);
T visitEncodingNode(EncodingNode iVisited);
T visitEnsureNode(EnsureNode iVisited);
T visitEvStrNode(EvStrNode iVisited);
T visitFCallNode(FCallNode iVisited);
T visitFalseNode(FalseNode iVisited);
T visitFixnumNode(FixnumNode iVisited);
T visitFlipNode(FlipNode iVisited);
T visitFloatNode(FloatNode iVisited);
T visitForNode(ForNode iVisited);
T visitGlobalAsgnNode(GlobalAsgnNode iVisited);
T visitGlobalVarNode(GlobalVarNode iVisited);
T visitHashNode(HashNode iVisited);
T visitInstAsgnNode(InstAsgnNode iVisited);
T visitInstVarNode(InstVarNode iVisited);
T visitIfNode(IfNode iVisited);
T visitIterNode(IterNode iVisited);
T visitKeywordArgNode(KeywordArgNode iVisited);
T visitKeywordRestArgNode(KeywordRestArgNode iVisited);
T visitLambdaNode(LambdaNode iVisited);
T visitListNode(ListNode iVisited);
T visitLiteralNode(LiteralNode iVisited);
T visitLocalAsgnNode(LocalAsgnNode iVisited);
T visitLocalVarNode(LocalVarNode iVisited);
T visitMultipleAsgnNode(MultipleAsgnNode iVisited);
T visitMatch2Node(Match2Node iVisited);
T visitMatch3Node(Match3Node iVisited);
T visitMatchNode(MatchNode iVisited);
T visitModuleNode(ModuleNode iVisited);
T visitNewlineNode(NewlineNode iVisited);
T visitNextNode(NextNode iVisited);
T visitNilNode(NilNode iVisited);
T visitNthRefNode(NthRefNode iVisited);
T visitOpElementAsgnNode(OpElementAsgnNode iVisited);
T visitOpAsgnNode(OpAsgnNode iVisited);
T visitOpAsgnAndNode(OpAsgnAndNode iVisited);
T visitOpAsgnOrNode(OpAsgnOrNode iVisited);
T visitOptArgNode(OptArgNode iVisited);
T visitOrNode(OrNode iVisited);
T visitPreExeNode(PreExeNode iVisited);
T visitPostExeNode(PostExeNode iVisited);
T visitRationalNode(RationalNode iVisited);
T visitRedoNode(RedoNode iVisited);
T visitRegexpNode(RegexpNode iVisited);
T visitRequiredKeywordArgumentValueNode(RequiredKeywordArgumentValueNode iVisited);
T visitRescueBodyNode(RescueBodyNode iVisited);
T visitRescueNode(RescueNode iVisited);
T visitRestArgNode(RestArgNode iVisited);
T visitRetryNode(RetryNode iVisited);
T visitReturnNode(ReturnNode iVisited);
T visitRootNode(RootNode iVisited);
T visitSClassNode(SClassNode iVisited);
T visitSelfNode(SelfNode iVisited);
T visitSplatNode(SplatNode iVisited);
T visitStarNode(StarNode iVisited);
T visitStrNode(StrNode iVisited);
T visitSuperNode(SuperNode iVisited);
T visitSValueNode(SValueNode iVisited);
T visitSymbolNode(SymbolNode iVisited);
T visitTrueNode(TrueNode iVisited);
T visitUndefNode(UndefNode iVisited);
T visitUntilNode(UntilNode iVisited);
T visitVAliasNode(VAliasNode iVisited);
T visitVCallNode(VCallNode iVisited);
T visitWhenNode(WhenNode iVisited);
T visitWhileNode(WhileNode iVisited);
T visitXStrNode(XStrNode iVisited);
T visitYieldNode(YieldNode iVisited);
T visitZArrayNode(ZArrayNode iVisited);
T visitZSuperNode(ZSuperNode iVisited);
T visitOther(Node iVisited);
}
9 changes: 1 addition & 8 deletions truffle/src/main/java/org/jruby/truffle/Main.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. This
* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved. This
* code is released under a tri EPL/GPL/LGPL license. You can use it,
* redistribute it and/or modify it under the terms of the:
*
@@ -55,13 +55,6 @@ public static void main(String[] args) {

RootNode scriptNode = (RootNode) runtime.parseFromMain(filename, in);

// If no DATA, we're done with the stream, shut it down
if (runtime.fetchGlobalConstant("DATA") == null) {
try {
in.close();
} catch (IOException ioe) {
}
}
ThreadContext context = runtime.getCurrentContext();

String oldFile = context.getFile();
7 changes: 1 addition & 6 deletions truffle/src/main/java/org/jruby/truffle/translator/TranslatorDriver.java
View file
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@

public class TranslatorDriver {

public static enum ParserContext {
public enum ParserContext {
TOP_LEVEL, SHELL, MODULE, EVAL, INLINE
}

@@ -204,11 +204,6 @@ private RubyRootNode parse(Node currentNode, RubyContext context, Source source,
return new RubyRootNode(context, truffleNode.getSourceSection(), environment.getFrameDescriptor(), sharedMethodInfo, truffleNode, environment.needsDeclarationFrame());
}

private Object getData(RubyContext context) {
// TODO CS 18-Apr-15 restore the DATA functionality
return null;
}

private TranslatorEnvironment environmentForFrame(RubyContext context, MaterializedFrame frame) {
if (frame == null) {
return null;