Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #30

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open

Fixes #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
74fae96
SetPlugin: fix incorrect composition
Locke Mar 22, 2018
1facc8b
transport cause
Locke Apr 13, 2018
32d1a9c
fix wrong error message (it was always null)
Locke Mar 23, 2018
e6540d8
SignaturePlugin: include note in message if update was not successful
Locke Aug 22, 2017
58ca4b1
add @Override
Locke Apr 1, 2018
a237ae2
HashStorage: cleanup dead code..
Locke Apr 1, 2018
3a86a0e
InterpreterImp.interpretExpressions: avoid expensive call to storage.…
Locke Apr 19, 2018
5ea706a
Plugin: calculate getName via getClass().getSimpleName() only once
Locke Mar 26, 2018
0fff91b
delete _.java
Locke Jun 3, 2017
5d30990
storage.getFunctionName: move search for key into NameTableFunction
Locke Apr 19, 2018
4d42bac
KernelExtensionsPlugin: avoid expensive call to getFunctionName in co…
Locke Apr 20, 2018
8f81a51
OptionsPlugin: avoid reassignment
Locke Dec 14, 2018
2e19890
ModularityPlugin: codestyle
Locke Dec 18, 2018
4904b8f
Specification: codestyle
Locke Dec 18, 2018
fe9e93b
pom.xml: skipTests via property
Locke Jan 10, 2019
317ce1b
update maven-compiler-plugin
Locke Mar 18, 2018
c150b04
update to junit 4.12
Locke Feb 3, 2019
ec7e304
add Set4_compose.casm test
Locke Feb 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions org.coreasm.engine/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
<relativePath>../org.coreasm.parent</relativePath>
</parent>

<properties>
<skipTests>true</skipTests>
</properties>

<build>
<resources>
<resource>
Expand Down Expand Up @@ -60,7 +64,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.16</version>
<configuration>
<skipTests>true</skipTests>
<skipTests>${skipTests}</skipTests>
<reuseForks>false</reuseForks>
<forkCount>0</forkCount>
</configuration>
Expand Down Expand Up @@ -103,7 +107,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.0</version>
<version>3.8.0</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
Expand Down Expand Up @@ -138,7 +142,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
<version>4.12</version>
</dependency>
<dependency>
<groupId>org.coreasm</groupId>
Expand Down
11 changes: 6 additions & 5 deletions org.coreasm.engine/src/org/coreasm/engine/Specification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,11 +323,12 @@ public Set<String> getPluginNames() {
* @see #loadSpec(String)
*/
public static ArrayList<SpecLine> loadSpec(Specification mainSpec, String fileName) throws IOException {
String specRoot = "";
if (mainSpec != null)
specRoot = mainSpec.getFileDir() + File.separator;

return loadSpec(specRoot + fileName);
if (mainSpec == null) {
return loadSpec(new File(fileName));
}
else {
return loadSpec(new File(mainSpec.getFileDir(), fileName));
}
}

/**
Expand Down
2 changes: 1 addition & 1 deletion org.coreasm.engine/src/org/coreasm/engine/absstorage/AbstractStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public interface AbstractStorage extends State {
* This method should only be called when there is a state in the stack.
*
* @param u the update multiset
* @see #pushState()
* @see #pushState(String pluginName)
*/
public void apply(Set<Update> u);

Expand Down
Loading