Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
QueryR
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Julien Lopez
QueryR
Commits
825cf6c2
Commit
825cf6c2
authored
6 years ago
by
Tomas Stupka
Committed by
stepan
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
to be executed statements in ExecutableNode have to be held as Children
parent
4ec96603
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/REngine.java
+27
-16
27 additions, 16 deletions
...fle.r.engine/src/com/oracle/truffle/r/engine/REngine.java
with
27 additions
and
16 deletions
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/REngine.java
+
27
−
16
View file @
825cf6c2
...
...
@@ -38,6 +38,7 @@ import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
import
com.oracle.truffle.api.CompilerDirectives.TruffleBoundary
;
import
com.oracle.truffle.api.RootCallTarget
;
import
com.oracle.truffle.api.Truffle
;
import
com.oracle.truffle.api.TruffleLanguage
;
import
com.oracle.truffle.api.dsl.UnsupportedSpecializationException
;
import
com.oracle.truffle.api.frame.Frame
;
import
com.oracle.truffle.api.frame.MaterializedFrame
;
...
...
@@ -45,6 +46,7 @@ import com.oracle.truffle.api.frame.VirtualFrame;
import
com.oracle.truffle.api.interop.TruffleObject
;
import
com.oracle.truffle.api.interop.java.JavaInterop
;
import
com.oracle.truffle.api.nodes.ExecutableNode
;
import
com.oracle.truffle.api.nodes.ExplodeLoop
;
import
com.oracle.truffle.api.nodes.Node
;
import
com.oracle.truffle.api.nodes.RootNode
;
import
com.oracle.truffle.api.profiles.ValueProfile
;
...
...
@@ -285,7 +287,7 @@ final class REngine implements Engine, Engine.Timings {
}
}
List
<
RSyntaxNode
>
parseSource
(
Source
source
)
throws
ParseException
{
private
List
<
RSyntaxNode
>
parseSource
(
Source
source
)
throws
ParseException
{
RParserFactory
.
Parser
<
RSyntaxNode
>
parser
=
RParserFactory
.
getParser
();
return
parser
.
script
(
source
,
new
RASTBuilder
(),
context
.
getLanguage
());
}
...
...
@@ -327,24 +329,33 @@ final class REngine implements Engine, Engine.Timings {
@Override
public
ExecutableNode
parseToExecutableNode
(
Source
source
)
throws
ParseException
{
List
<
RSyntaxNode
>
list
=
parseSource
(
source
);
RNode
[]
statements
=
new
RNode
[
list
.
size
()];
for
(
int
i
=
0
;
i
<
statements
.
length
;
i
++)
{
statements
[
i
]
=
list
.
get
(
i
).
asRNode
();
return
new
ExecutableNodeImpl
(
context
.
getLanguage
(),
list
);
}
private
class
ExecutableNodeImpl
extends
ExecutableNode
{
@Child
R2Foreign
toForeignNode
=
R2Foreign
.
create
();
@Children
final
RNode
[]
statements
;
private
ExecutableNodeImpl
(
TruffleLanguage
<?>
language
,
List
<
RSyntaxNode
>
list
)
{
super
(
language
);
statements
=
new
RNode
[
list
.
size
()];
for
(
int
i
=
0
;
i
<
statements
.
length
;
i
++)
{
statements
[
i
]
=
list
.
get
(
i
).
asRNode
();
}
}
return
new
ExecutableNode
(
context
.
getLanguage
())
{
@Child
private
R2Foreign
toForeignNode
=
R2Foreign
.
create
();
@Override
public
Object
execute
(
VirtualFrame
frame
)
{
if
(
statements
.
length
==
0
)
{
return
RNull
.
instance
;
}
for
(
int
i
=
0
;
i
<
statements
.
length
-
1
;
i
++)
{
statements
[
i
].
execute
(
frame
);
}
return
toForeignNode
.
execute
(
statements
[
statements
.
length
-
1
].
execute
(
frame
));
@Override
@ExplodeLoop
public
Object
execute
(
VirtualFrame
frame
)
{
if
(
statements
.
length
==
0
)
{
return
RNull
.
instance
;
}
};
for
(
int
i
=
0
;
i
<
statements
.
length
-
1
;
i
++)
{
statements
[
i
].
execute
(
frame
);
}
return
toForeignNode
.
execute
(
statements
[
statements
.
length
-
1
].
execute
(
frame
));
}
}
private
static
SourceSection
createSourceSection
(
Source
source
,
List
<
RSyntaxNode
>
statements
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment