Skip to content

Commit c53a238

Browse files
authored
Merge pull request #2001 from usethesource/adopt-tutor-code
Merges tutor code back into the rascal project
2 parents 14e8d7b + 39a03ee commit c53a238

40 files changed

Lines changed: 6681 additions & 2 deletions

META-INF/RASCAL.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Project-Name: rascal
2-
Source: src/org/rascalmpl/library,test/org/rascalmpl/benchmark,test//org/rascalmpl/test/data
2+
Source: src/org/rascalmpl/library,src/org/rascalmpl/tutor,test/org/rascalmpl/benchmark,test/org/rascalmpl/test/data
33
Courses: src/org/rascalmpl/courses
44

55

pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<scm>
1010
<developerConnection>scm:git:ssh://git@github.com/usethesource/rascal.git</developerConnection>
11-
<tag>v0.41.0-RC1</tag>
11+
<tag>HEAD</tag>
1212
</scm>
1313

1414
<!-- dependency resolution configuration (usethesource) -->
@@ -137,6 +137,7 @@
137137
<bin>${project.build.outputDirectory}</bin>
138138
<srcs>
139139
<src>${project.basedir}/src/org/rascalmpl/library</src>
140+
<src>${project.basedir}/src/org/rascalmpl/tutor</src>
140141
</srcs>
141142
<sourceLookup>|std:///|</sourceLookup>
142143
<funding>${project.basedir}/FUNDING</funding>

src/org/rascalmpl/repl/rascal/RascalInterpreterREPL.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,11 @@ public void cancelRunningCommandRequested() {
180180
eval.endAllJobs();
181181
}
182182

183+
public void cleanEnvironment() {
184+
Objects.requireNonNull(eval, "Not initialized yet");
185+
eval.getCurrentModuleEnvironment().reset();
186+
}
187+
183188
@Override
184189
public ICommandOutput stackTraceRequested() {
185190
Objects.requireNonNull(eval, "Not initialized yet");

0 commit comments

Comments
 (0)