From 422d767e8de758ad7fd04dc51d459983dbf3b53b Mon Sep 17 00:00:00 2001 From: Niall Gallagher Date: Sun, 21 Aug 2016 18:26:32 +0100 Subject: [PATCH] Add clover ignores --- snap-common/.classpath | 1 + snap-common/.gitignore | 1 + snap-common/.project | 11 +++++++ snap-common/pom.xml | 2 +- snap-compile/.classpath | 1 + snap-compile/.gitignore | 1 + snap-compile/.project | 11 +++++++ snap-compile/pom.xml | 8 ++--- snap-core/.classpath | 1 + snap-core/.gitignore | 1 + snap-core/.project | 11 +++++++ snap-core/pom.xml | 4 +-- snap-parse/.classpath | 1 + snap-parse/.gitignore | 1 + snap-parse/.project | 11 +++++++ snap-parse/pom.xml | 4 +-- snap-tree/.classpath | 1 + snap-tree/.gitignore | 1 + snap-tree/.project | 11 +++++++ snap-tree/pom.xml | 32 +++++++++++++++++-- .../tree/define/InstanceAllocator.java | 14 ++++---- 21 files changed, 110 insertions(+), 19 deletions(-) diff --git a/snap-common/.classpath b/snap-common/.classpath index bc5aeac5..defc0e53 100644 --- a/snap-common/.classpath +++ b/snap-common/.classpath @@ -1,5 +1,6 @@ + diff --git a/snap-common/.gitignore b/snap-common/.gitignore index 2c36b173..24a628f2 100644 --- a/snap-common/.gitignore +++ b/snap-common/.gitignore @@ -1,2 +1,3 @@ /target /.settings +/.clover/ diff --git a/snap-common/.project b/snap-common/.project index 75fc49fc..98af5b07 100644 --- a/snap-common/.project +++ b/snap-common/.project @@ -5,11 +5,21 @@ + + com.atlassian.clover.eclipse.core.prejavabuilder + + + org.eclipse.jdt.core.javabuilder + + com.atlassian.clover.eclipse.core.postjavabuilder + + + org.eclipse.m2e.core.maven2Builder @@ -19,5 +29,6 @@ org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature + com.atlassian.clover.eclipse.core.clovernature diff --git a/snap-common/pom.xml b/snap-common/pom.xml index 178a191c..d2258662 100644 --- a/snap-common/pom.xml +++ b/snap-common/pom.xml @@ -3,7 +3,7 @@ org.snapscript snap-common jar - 1.0-SNAPSHOT + 1.0 http://www.snapscript.org diff --git a/snap-compile/.classpath b/snap-compile/.classpath index cce1cc3b..6f5a7f87 100644 --- a/snap-compile/.classpath +++ b/snap-compile/.classpath @@ -1,5 +1,6 @@ + diff --git a/snap-compile/.gitignore b/snap-compile/.gitignore index 8d723015..69622a0a 100644 --- a/snap-compile/.gitignore +++ b/snap-compile/.gitignore @@ -1,3 +1,4 @@ /target /.settings /xx..bin +/.clover/ diff --git a/snap-compile/.project b/snap-compile/.project index b9d9bf0b..7f217e97 100644 --- a/snap-compile/.project +++ b/snap-compile/.project @@ -5,11 +5,21 @@ + + com.atlassian.clover.eclipse.core.prejavabuilder + + + org.eclipse.jdt.core.javabuilder + + com.atlassian.clover.eclipse.core.postjavabuilder + + + org.eclipse.m2e.core.maven2Builder @@ -19,5 +29,6 @@ org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature + com.atlassian.clover.eclipse.core.clovernature diff --git a/snap-compile/pom.xml b/snap-compile/pom.xml index daae27f1..adbd0a04 100644 --- a/snap-compile/pom.xml +++ b/snap-compile/pom.xml @@ -3,23 +3,23 @@ org.snapscript snap-compile jar - 1.0-SNAPSHOT + 1.0 http://www.snapscript.org org.snapscript snap-tree - 1.0-SNAPSHOT + 1.0 org.snapscript snap-core - 1.0-SNAPSHOT + 1.0 org.snapscript snap-parse - 1.0-SNAPSHOT + 1.0 org.simpleframework diff --git a/snap-core/.classpath b/snap-core/.classpath index 9c8395b8..ace2ab9e 100644 --- a/snap-core/.classpath +++ b/snap-core/.classpath @@ -1,5 +1,6 @@ + diff --git a/snap-core/.gitignore b/snap-core/.gitignore index 2c36b173..24a628f2 100644 --- a/snap-core/.gitignore +++ b/snap-core/.gitignore @@ -1,2 +1,3 @@ /target /.settings +/.clover/ diff --git a/snap-core/.project b/snap-core/.project index 81f598fb..827fe683 100644 --- a/snap-core/.project +++ b/snap-core/.project @@ -5,11 +5,21 @@ + + com.atlassian.clover.eclipse.core.prejavabuilder + + + org.eclipse.jdt.core.javabuilder + + com.atlassian.clover.eclipse.core.postjavabuilder + + + org.eclipse.m2e.core.maven2Builder @@ -19,5 +29,6 @@ org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature + com.atlassian.clover.eclipse.core.clovernature diff --git a/snap-core/pom.xml b/snap-core/pom.xml index 348ed57d..9e5ed90c 100644 --- a/snap-core/pom.xml +++ b/snap-core/pom.xml @@ -3,13 +3,13 @@ org.snapscript snap-core jar - 1.0-SNAPSHOT + 1.0 http://www.snapscript.org org.snapscript snap-common - 1.0-SNAPSHOT + 1.0 junit diff --git a/snap-parse/.classpath b/snap-parse/.classpath index cce1cc3b..6f5a7f87 100644 --- a/snap-parse/.classpath +++ b/snap-parse/.classpath @@ -1,5 +1,6 @@ + diff --git a/snap-parse/.gitignore b/snap-parse/.gitignore index 2c36b173..24a628f2 100644 --- a/snap-parse/.gitignore +++ b/snap-parse/.gitignore @@ -1,2 +1,3 @@ /target /.settings +/.clover/ diff --git a/snap-parse/.project b/snap-parse/.project index 3a5da4c7..5545beaf 100644 --- a/snap-parse/.project +++ b/snap-parse/.project @@ -5,11 +5,21 @@ + + com.atlassian.clover.eclipse.core.prejavabuilder + + + org.eclipse.jdt.core.javabuilder + + com.atlassian.clover.eclipse.core.postjavabuilder + + + org.eclipse.m2e.core.maven2Builder @@ -19,5 +29,6 @@ org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature + com.atlassian.clover.eclipse.core.clovernature diff --git a/snap-parse/pom.xml b/snap-parse/pom.xml index 700e3eae..fd110ab8 100644 --- a/snap-parse/pom.xml +++ b/snap-parse/pom.xml @@ -3,13 +3,13 @@ org.snapscript snap-parse jar - 1.0-SNAPSHOT + 1.0 http://www.snapscript.org org.snapscript snap-common - 1.0-SNAPSHOT + 1.0 junit diff --git a/snap-tree/.classpath b/snap-tree/.classpath index cce1cc3b..6f5a7f87 100644 --- a/snap-tree/.classpath +++ b/snap-tree/.classpath @@ -1,5 +1,6 @@ + diff --git a/snap-tree/.gitignore b/snap-tree/.gitignore index 8d723015..69622a0a 100644 --- a/snap-tree/.gitignore +++ b/snap-tree/.gitignore @@ -1,3 +1,4 @@ /target /.settings /xx..bin +/.clover/ diff --git a/snap-tree/.project b/snap-tree/.project index b9d9bf0b..7f217e97 100644 --- a/snap-tree/.project +++ b/snap-tree/.project @@ -5,11 +5,21 @@ + + com.atlassian.clover.eclipse.core.prejavabuilder + + + org.eclipse.jdt.core.javabuilder + + com.atlassian.clover.eclipse.core.postjavabuilder + + + org.eclipse.m2e.core.maven2Builder @@ -19,5 +29,6 @@ org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature + com.atlassian.clover.eclipse.core.clovernature diff --git a/snap-tree/pom.xml b/snap-tree/pom.xml index ed5cef01..ca2a44c8 100644 --- a/snap-tree/pom.xml +++ b/snap-tree/pom.xml @@ -3,18 +3,18 @@ org.snapscript snap-tree jar - 1.0-SNAPSHOT + 1.0 http://www.snapscript.org org.snapscript snap-core - 1.0-SNAPSHOT + 1.0 org.snapscript snap-parse - 1.0-SNAPSHOT + 1.0 org.simpleframework @@ -29,6 +29,32 @@ test + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.7 + + false + + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.6 + + + html + xml + + + + + + diff --git a/snap-tree/src/main/java/org/snapscript/tree/define/InstanceAllocator.java b/snap-tree/src/main/java/org/snapscript/tree/define/InstanceAllocator.java index fb6d7e8d..23fbe739 100644 --- a/snap-tree/src/main/java/org/snapscript/tree/define/InstanceAllocator.java +++ b/snap-tree/src/main/java/org/snapscript/tree/define/InstanceAllocator.java @@ -25,16 +25,16 @@ public InstanceAllocator(Initializer initializer, Invocation invocation, Type ty @Override public Instance allocate(Scope scope, Instance base, Object... list) throws Exception { Type real = (Type)list[0]; - Instance object = builder.create(scope, base, real);// we need to pass the base type up!! - State state = object.getState(); + Instance instance = builder.create(scope, base, real);// we need to pass the base type up!! + State state = instance.getState(); Value value = state.getValue(TYPE_THIS); - if(object != base) { // false if this(...) called - initializer.execute(object, real); + if(instance != base) { // false if this(...) is called + initializer.execute(instance, real); } - value.setValue(object); // set the 'this' variable - invocation.invoke(object, object, list); + value.setValue(instance); // set the 'this' variable + invocation.invoke(instance, instance, list); - return object; + return instance; } }