- * Additionally to storing a variable's type, a dirty-bit is maintained, which
- * indicates whether a variable's type is guaranteed to be of the declared type.
- *
- * A variable can become dirty if its type changes to an incompatible type
- * in code which is not guaranteed to be executed, such as branches of a
- * conditional statement or the body of an iteration statement.
- *
- * To keep track of those changes, the state of the symbol table can be
- * {@link #storeState() stored} before entering such code, and
- * {@link #restoreState(ASTStatement) restored} afterwards.
- * After restoring it is checked, whether an assignment of an incompatible
- * type was made.
- *
- * Storing and restoring states uses a stack, which allows arbitrarily nested
- * statements.
- *
- * @author Daniel Gent
- */
-public class SymbolTable {
- /**
- * Entry for the symbol table.
- *
- * @author Daniel Gent
- */
- private class Entry {
- /** the variable's type */
- Type type;
- /** dirty bit */
- boolean isDirty = false;
- /** soil statement causing this entry to be dirty */
- ASTStatement cause = null;
-
-
- /**
- * constructs a new Entry
- *
- * @param type the variable's type
- */
- public Entry(Type type) {
- this.type = type;
- }
-
- @Override
- public String toString() {
- if (isDirty) {
- return type + " (DIRTY due to " + ((cause == null) ? "UNKNOWN" : cause) + ")";
- } else {
- return type.toString();
- }
- }
- }
-
- /** the entries */
- private Map fEntries;
- /** the stack of states */
- private Deque> fStates =
- new ArrayDeque>();
-
- //TODO: refactor both to one stack with a proper data object per frame
- /** the stack of explicit/implicit */
- private Deque fExplicitState =
- new ArrayDeque();
-
-
- private MSystemState fVisibleState ;
-
- /**
- * constructs an empty symbol table
- */
- public SymbolTable() {
- fStates.push(new LinkedHashMap());
- fExplicitState.push(Boolean.FALSE);
- fEntries = fStates.peek();
- }
-
- /**
- * constructs an empty symbol table with the visible
- * objects from state
- */
- public SymbolTable(MSystemState visibleState) {
- this();
- fVisibleState = visibleState;
- }
-
- /**
- * construct a symbol table from a {@code VariableEnvironment}
- *
- * @param variableEnvironment a variable environment
- */
- public SymbolTable(VariableEnvironment variableEnvironment) {
- fStates = variableEnvironment.constructSymbolTable().fStates;
- fExplicitState.push(Boolean.FALSE);
-
- }
-
-
- /**
- * removes all states and mappings
- */
- public void clear() {
- fStates.clear();
- fExplicitState.clear();
- fStates.push(new LinkedHashMap());
- fExplicitState.push(Boolean.FALSE);
- fEntries = fStates.peek();
- }
-
-
- /**
- * copies the current state and pushes it to a stack
- *
- * @see SymbolTable#restoreState(ASTStatement)
- */
- public void storeState(Boolean explicit) {
- fStates.push(new LinkedHashMap(fEntries));
- fEntries = fStates.peek();
- fExplicitState.push(explicit);
- }
-
- public void storeState() {
- Boolean b = fExplicitState.peek();
- storeState(b);
- }
-
-
- /**
- * the current state is destroyed and the most recently stored state becomes
- * the new current state
- *
- * additionally the current and the stored state are compared. if the type
- * of a variable has changed from the stored state to the current state,
- * and the type is incompatible (i.e. the new type is not a sub-type of the
- * stored type), the variable is flagged as being dirty, and the supplied
- * soil statement gets blamed.
- *
- * @param cause the soil statement to blame for a variable becoming dirty
- */
- public void restoreState(ASTStatement cause) {
- if (fStates.size() <= 1) {
- return;
- }
-
- Map poppedState = fStates.pop();
- fExplicitState.pop();
- fEntries = fStates.peek();
-
- Set sharedNames = new HashSet(fEntries.keySet());
- sharedNames.retainAll(poppedState.keySet());
-
- for (String name : sharedNames) {
- Entry thisEntry = fEntries.get(name);
- Entry thatEntry = poppedState.get(name);
-
- if (!thatEntry.type.conformsTo(thisEntry.type)) {
- thisEntry.isDirty = true;
- thisEntry.cause = cause;
- } else if (thatEntry.isDirty) {
- thisEntry.isDirty = true;
- thisEntry.cause = thatEntry.cause;
- }
- }
- }
-
-
- /**
- * sets the type of a variable
- *
- * @param name name of the variable
- * @param type type of the variable
- */
- public void setType(String name, Type type) {
- fEntries.put(name, new Entry(type));
- }
-
- /**
- * Returns an entry by looking into the
- * entries constructed by adding elements
- * to the SymTable or if nothing found by
- * looking into the objects of the system sate.
- * @param name
- * @return An entry for name or null.
- */
- private Entry getEntry(String name) {
- Entry entry = fEntries.get(name);
-
- if (entry == null && fVisibleState != null) {
- MObject obj = fVisibleState.objectByName(name);
- if (obj != null)
- return new Entry(obj.cls());
- }
-
- return entry;
- }
- /**
- * returns true if this contains a variable with the specified name
- *
- * @param name the name specifying the variable
- * @return true if this contains a variable with the specified name
- */
- public boolean contains(String name) {
- return getEntry(name) != null;
- }
-
-
- /**
- * returns true if the dirty bit for the specified variable is set
- *
- * @param name the name specifying the variable
- * @return true if the dirty bit for the specified variable is set
- */
- public boolean isDirty(String name) {
- Entry entry = getEntry(name);
-
- if (entry != null) {
- return entry.isDirty;
- }
-
- return false;
- }
-
-
- /**
- * returns the soil statement causing the specified variable to be dirty
- *
- * @param name the name specifying the variable
- * @return the soil statement causing this variable to be dirty or
- * {@code null} if there isn't a variable with the specified name,
- * or the variable is not flagged as dirty
- */
- public ASTStatement getCause(String name) {
- Entry entry = getEntry(name);
-
- if ((entry != null) && (entry.isDirty)) {
- return entry.cause;
- } else {
- return null;
- }
- }
-
-
- /**
- * returns the type of the specified variable
- *
- * @param name the name specifying the variable
- * @return the variable's type or {@code null} if there is no such variable
- */
- public Type getType(String name) {
- Entry entry = getEntry(name);
-
- if (entry != null) {
- return entry.type;
- } else {
- return null;
- }
- }
-
-
- @Override
- public String toString() {
- int numStates = fStates.size();
-
- final String STPRE = "[state ";
- final String STPST = "]\n";
- final String COLON = " : ";
- final String NEWLN = "\n";
- final String EMPTY = "empty\n";
- final String PRELUDE = (numStates > 1) ? " " : "";
-
- StringBuilder sb = new StringBuilder();
-
- int currentState = numStates;
- for (Map state : fStates) {
- if (numStates > 1) {
- sb.append(STPRE);
- sb.append(--currentState);
- sb.append(STPST);
- }
-
- if (state.isEmpty()) {
- sb.append(PRELUDE);
- sb.append(EMPTY);
- }
-
- for (Map.Entry entry : state.entrySet()) {
- String variableName = entry.getKey();
- Entry variableEntry = entry.getValue();
-
- sb.append(PRELUDE);
- sb.append(variableName);
- sb.append(COLON);
- sb.append(variableEntry);
- sb.append(NEWLN);
- }
- }
-
- return sb.toString();
- }
-
- /**
- * @return
- */
- public boolean isExplicit() {
- return fExplicitState.peek();
-}
-
-}
+/*
+ * USE - UML based specification environment
+ * Copyright (C) 1999-2010 Mark Richters, University of Bremen
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.tzi.use.parser.soil.environment;
+
+
+
+import org.tzi.use.uml.ocl.type.Type;
+import org.tzi.use.uml.sys.MObject;
+import org.tzi.use.uml.sys.MSystemState;
+import org.tzi.use.uml.sys.soil.VariableEnvironment;
+
+import java.util.*;
+
+
+/**
+ * A symbol table containing mappings from a variable name to a
+ * {@link Type type}.
+ *
+ * Additionally to storing a variable's type, a dirty-bit is maintained, which
+ * indicates whether a variable's type is guaranteed to be of the declared type.
+ *
+ * A variable can become dirty if its type changes to an incompatible type
+ * in code which is not guaranteed to be executed, such as branches of a
+ * conditional statement or the body of an iteration statement.
+ *
+ * To keep track of those changes, the state of the symbol table can be
+ * {@link #storeState() stored} before entering such code, and
+ * {@link #restoreState(ASTStatement) restored} afterwards.
+ * After restoring it is checked, whether an assignment of an incompatible
+ * type was made.
+ *
+ * Storing and restoring states uses a stack, which allows arbitrarily nested
+ * statements.
+ *
+ * @author Daniel Gent
+ */
+public class SymbolTable {
+ /**
+ * Entry for the symbol table.
+ *
+ * @author Daniel Gent
+ */
+ private class Entry {
+ /** the variable's type */
+ Type type;
+ /** dirty bit */
+ boolean isDirty = false;
+ /** soil statement causing this entry to be dirty */
+ Object cause = null;
+
+
+ /**
+ * constructs a new Entry
+ *
+ * @param type the variable's type
+ */
+ public Entry(Type type) {
+ this.type = type;
+ }
+
+ @Override
+ public String toString() {
+ if (isDirty) {
+ return type + " (DIRTY due to " + ((cause == null) ? "UNKNOWN" : cause) + ")";
+ } else {
+ return type.toString();
+ }
+ }
+ }
+
+ /** the entries */
+ private Map fEntries;
+ /** the stack of states */
+ private Deque> fStates =
+ new ArrayDeque>();
+
+ //TODO: refactor both to one stack with a proper data object per frame
+ /** the stack of explicit/implicit */
+ private Deque fExplicitState =
+ new ArrayDeque();
+
+
+ private MSystemState fVisibleState ;
+
+ /**
+ * constructs an empty symbol table
+ */
+ public SymbolTable() {
+ fStates.push(new LinkedHashMap());
+ fExplicitState.push(Boolean.FALSE);
+ fEntries = fStates.peek();
+ }
+
+ /**
+ * constructs an empty symbol table with the visible
+ * objects from state
+ */
+ public SymbolTable(MSystemState visibleState) {
+ this();
+ fVisibleState = visibleState;
+ }
+
+ /**
+ * construct a symbol table from a {@code VariableEnvironment}
+ *
+ * @param variableEnvironment a variable environment
+ */
+ public SymbolTable(VariableEnvironment variableEnvironment) {
+ this();
+ if (variableEnvironment.isObjectVisible()) {
+ fVisibleState = variableEnvironment.getSystemState();
+ }
+
+ for (java.util.Map.Entry entry : variableEnvironment.getCurrentMappings().entrySet()) {
+ String varName = entry.getKey();
+ setType(varName, entry.getValue().type());
+ }
+ }
+
+
+ /**
+ * removes all states and mappings
+ */
+ public void clear() {
+ fStates.clear();
+ fExplicitState.clear();
+ fStates.push(new LinkedHashMap());
+ fExplicitState.push(Boolean.FALSE);
+ fEntries = fStates.peek();
+ }
+
+
+ /**
+ * copies the current state and pushes it to a stack
+ *
+ * @see SymbolTable#restoreState(ASTStatement)
+ */
+ public void storeState(Boolean explicit) {
+ fStates.push(new LinkedHashMap(fEntries));
+ fEntries = fStates.peek();
+ fExplicitState.push(explicit);
+ }
+
+ public void storeState() {
+ Boolean b = fExplicitState.peek();
+ storeState(b);
+ }
+
+
+ /**
+ * the current state is destroyed and the most recently stored state becomes
+ * the new current state
+ *
+ * additionally the current and the stored state are compared. if the type
+ * of a variable has changed from the stored state to the current state,
+ * and the type is incompatible (i.e. the new type is not a sub-type of the
+ * stored type), the variable is flagged as being dirty, and the supplied
+ * soil statement gets blamed.
+ *
+ * @param cause the soil statement to blame for a variable becoming dirty
+ */
+ public void restoreState(Object cause) {
+ if (fStates.size() <= 1) {
+ return;
+ }
+
+ Map poppedState = fStates.pop();
+ fExplicitState.pop();
+ fEntries = fStates.peek();
+
+ Set sharedNames = new HashSet(fEntries.keySet());
+ sharedNames.retainAll(poppedState.keySet());
+
+ for (String name : sharedNames) {
+ Entry thisEntry = fEntries.get(name);
+ Entry thatEntry = poppedState.get(name);
+
+ if (!thatEntry.type.conformsTo(thisEntry.type)) {
+ thisEntry.isDirty = true;
+ thisEntry.cause = cause;
+ } else if (thatEntry.isDirty) {
+ thisEntry.isDirty = true;
+ thisEntry.cause = thatEntry.cause;
+ }
+ }
+ }
+
+
+ /**
+ * sets the type of a variable
+ *
+ * @param name name of the variable
+ * @param type type of the variable
+ */
+ public void setType(String name, Type type) {
+ fEntries.put(name, new Entry(type));
+ }
+
+ /**
+ * Returns an entry by looking into the
+ * entries constructed by adding elements
+ * to the SymTable or if nothing found by
+ * looking into the objects of the system sate.
+ * @param name
+ * @return An entry for name or null.
+ */
+ private Entry getEntry(String name) {
+ Entry entry = fEntries.get(name);
+
+ if (entry == null && fVisibleState != null) {
+ MObject obj = fVisibleState.objectByName(name);
+ if (obj != null)
+ return new Entry(obj.cls());
+ }
+
+ return entry;
+ }
+ /**
+ * returns true if this contains a variable with the specified name
+ *
+ * @param name the name specifying the variable
+ * @return true if this contains a variable with the specified name
+ */
+ public boolean contains(String name) {
+ return getEntry(name) != null;
+ }
+
+
+ /**
+ * returns true if the dirty bit for the specified variable is set
+ *
+ * @param name the name specifying the variable
+ * @return true if the dirty bit for the specified variable is set
+ */
+ public boolean isDirty(String name) {
+ Entry entry = getEntry(name);
+
+ if (entry != null) {
+ return entry.isDirty;
+ }
+
+ return false;
+ }
+
+
+ /**
+ * returns the soil statement causing the specified variable to be dirty
+ *
+ * @param name the name specifying the variable
+ * @return the soil statement causing this variable to be dirty or
+ * {@code null} if there isn't a variable with the specified name,
+ * or the variable is not flagged as dirty
+ */
+ public Object getCause(String name) {
+ Entry entry = getEntry(name);
+
+ if ((entry != null) && (entry.isDirty)) {
+ return entry.cause;
+ } else {
+ return null;
+ }
+ }
+
+
+ /**
+ * returns the type of the specified variable
+ *
+ * @param name the name specifying the variable
+ * @return the variable's type or {@code null} if there is no such variable
+ */
+ public Type getType(String name) {
+ Entry entry = getEntry(name);
+
+ if (entry != null) {
+ return entry.type;
+ } else {
+ return null;
+ }
+ }
+
+
+ @Override
+ public String toString() {
+ int numStates = fStates.size();
+
+ final String STPRE = "[state ";
+ final String STPST = "]\n";
+ final String COLON = " : ";
+ final String NEWLN = "\n";
+ final String EMPTY = "empty\n";
+ final String PRELUDE = (numStates > 1) ? " " : "";
+
+ StringBuilder sb = new StringBuilder();
+
+ int currentState = numStates;
+ for (Map state : fStates) {
+ if (numStates > 1) {
+ sb.append(STPRE);
+ sb.append(--currentState);
+ sb.append(STPST);
+ }
+
+ if (state.isEmpty()) {
+ sb.append(PRELUDE);
+ sb.append(EMPTY);
+ }
+
+ for (Map.Entry entry : state.entrySet()) {
+ String variableName = entry.getKey();
+ Entry variableEntry = entry.getValue();
+
+ sb.append(PRELUDE);
+ sb.append(variableName);
+ sb.append(COLON);
+ sb.append(variableEntry);
+ sb.append(NEWLN);
+ }
+ }
+
+ return sb.toString();
+ }
+
+ /**
+ * @return
+ */
+ public boolean isExplicit() {
+ return fExplicitState.peek();
+}
+
+}
diff --git a/use-core/src/main/java/org/tzi/use/util/soil/exceptions/CompilationFailedException.java b/use-core/src/main/java/org/tzi/use/parser/soil/exceptions/CompilationFailedException.java
similarity index 93%
rename from use-core/src/main/java/org/tzi/use/util/soil/exceptions/CompilationFailedException.java
rename to use-core/src/main/java/org/tzi/use/parser/soil/exceptions/CompilationFailedException.java
index b43d2abda..66986bcaa 100644
--- a/use-core/src/main/java/org/tzi/use/util/soil/exceptions/CompilationFailedException.java
+++ b/use-core/src/main/java/org/tzi/use/parser/soil/exceptions/CompilationFailedException.java
@@ -1,84 +1,84 @@
-/*
- * USE - UML based specification environment
- * Copyright (C) 1999-2010 Mark Richters, University of Bremen
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.tzi.use.util.soil.exceptions;
-
-import org.tzi.use.parser.SrcPos;
-import org.tzi.use.parser.soil.ast.ASTStatement;
-
-
-/**
- * This exception is used if a soil statement
- * could not be "compiled".
- * @author Daniel Gent
- * @author Lars Hamann
- */
-public class CompilationFailedException extends Exception {
- private static final long serialVersionUID = 1L;
-
- /** The source position, if any of the failed statement **/
- private SrcPos sourcePosition;
-
- /**
- * Constructs a new exception using the AST of the statement failed to be compiled and a message.
- * @param statement The AST of the failed statement.
- * @param message A user defined message.
- */
- public CompilationFailedException(
- ASTStatement statement,
- String message) {
-
- super(message);
- sourcePosition = statement.getSourcePosition();
- }
-
-
- /**
- * Constructs a new exception using the AST of the statement failed to be
- * compiled, a message and the original cause.
- * @param statement The AST of the failed statement.
- * @param message A user defined message.
- */
- public CompilationFailedException(
- ASTStatement statement,
- String message,
- Throwable cause) {
-
- super(message, cause);
- sourcePosition = statement.getSourcePosition();
- }
-
- @Override
- public String getMessage() {
- return getMessage(false);
- }
-
- public String getMessage(boolean includePositionInfomation) {
- if (!includePositionInfomation) return super.getMessage();
-
- String locationString;
- if (sourcePosition != null) {
- locationString = sourcePosition.toString();
- } else {
- locationString = "";
- }
-
- return locationString + super.getMessage();
- }
-}
+/*
+ * USE - UML based specification environment
+ * Copyright (C) 1999-2010 Mark Richters, University of Bremen
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.tzi.use.parser.soil.exceptions;
+
+import org.tzi.use.util.SrcPos;
+import org.tzi.use.parser.soil.ast.ASTStatement;
+
+
+/**
+ * This exception is used if a soil statement
+ * could not be "compiled".
+ * @author Daniel Gent
+ * @author Lars Hamann
+ */
+public class CompilationFailedException extends Exception {
+ private static final long serialVersionUID = 1L;
+
+ /** The source position, if any of the failed statement **/
+ private SrcPos sourcePosition;
+
+ /**
+ * Constructs a new exception using the AST of the statement failed to be compiled and a message.
+ * @param statement The AST of the failed statement.
+ * @param message A user defined message.
+ */
+ public CompilationFailedException(
+ ASTStatement statement,
+ String message) {
+
+ super(message);
+ sourcePosition = statement.getSourcePosition();
+ }
+
+
+ /**
+ * Constructs a new exception using the AST of the statement failed to be
+ * compiled, a message and the original cause.
+ * @param statement The AST of the failed statement.
+ * @param message A user defined message.
+ */
+ public CompilationFailedException(
+ ASTStatement statement,
+ String message,
+ Throwable cause) {
+
+ super(message, cause);
+ sourcePosition = statement.getSourcePosition();
+ }
+
+ @Override
+ public String getMessage() {
+ return getMessage(false);
+ }
+
+ public String getMessage(boolean includePositionInfomation) {
+ if (!includePositionInfomation) return super.getMessage();
+
+ String locationString;
+ if (sourcePosition != null) {
+ locationString = sourcePosition.toString();
+ } else {
+ locationString = "";
+ }
+
+ return locationString + super.getMessage();
+ }
+}
diff --git a/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTAssert.java b/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTAssert.java
index b96bacf45..bb0a7aecc 100644
--- a/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTAssert.java
+++ b/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTAssert.java
@@ -5,9 +5,9 @@
import org.antlr.runtime.Token;
import org.tzi.use.parser.AST;
import org.tzi.use.parser.Context;
-import org.tzi.use.parser.SemanticException;
-import org.tzi.use.parser.SrcPos;
-import org.tzi.use.uml.sys.testsuite.MAssert;
+import org.tzi.use.uml.ocl.expr.SemanticException;
+import org.tzi.use.util.SrcPos;
+import org.tzi.use.parser.testsuite.sys.MAssert;
public abstract class ASTAssert extends AST {
private Token start;
diff --git a/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTAssertClassInvariants.java b/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTAssertClassInvariants.java
index 3fe59cfa1..89120e348 100644
--- a/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTAssertClassInvariants.java
+++ b/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTAssertClassInvariants.java
@@ -2,10 +2,10 @@
import org.antlr.runtime.Token;
import org.tzi.use.parser.Context;
-import org.tzi.use.parser.SemanticException;
+import org.tzi.use.uml.ocl.expr.SemanticException;
import org.tzi.use.uml.mm.MClass;
-import org.tzi.use.uml.sys.testsuite.MAssert;
-import org.tzi.use.uml.sys.testsuite.MAssertClassInvariants;
+import org.tzi.use.parser.testsuite.sys.MAssert;
+import org.tzi.use.parser.testsuite.sys.MAssertClassInvariants;
public class ASTAssertClassInvariants extends ASTAssert {
diff --git a/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTAssertGlobalInvariants.java b/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTAssertGlobalInvariants.java
index 2ad6f431d..1df6cb087 100644
--- a/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTAssertGlobalInvariants.java
+++ b/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTAssertGlobalInvariants.java
@@ -2,9 +2,9 @@
import org.antlr.runtime.Token;
import org.tzi.use.parser.Context;
-import org.tzi.use.parser.SemanticException;
-import org.tzi.use.uml.sys.testsuite.MAssert;
-import org.tzi.use.uml.sys.testsuite.MAssertGlobalInvariants;
+import org.tzi.use.uml.ocl.expr.SemanticException;
+import org.tzi.use.parser.testsuite.sys.MAssert;
+import org.tzi.use.parser.testsuite.sys.MAssertGlobalInvariants;
public class ASTAssertGlobalInvariants extends ASTAssert {
diff --git a/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTAssertOclExpression.java b/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTAssertOclExpression.java
index 52bf7bc91..81782fedd 100644
--- a/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTAssertOclExpression.java
+++ b/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTAssertOclExpression.java
@@ -2,12 +2,12 @@
import org.antlr.runtime.Token;
import org.tzi.use.parser.Context;
-import org.tzi.use.parser.SemanticException;
+import org.tzi.use.uml.ocl.expr.SemanticException;
import org.tzi.use.parser.ocl.ASTExpression;
import org.tzi.use.uml.ocl.expr.Expression;
import org.tzi.use.uml.ocl.type.TypeFactory;
-import org.tzi.use.uml.sys.testsuite.MAssert;
-import org.tzi.use.uml.sys.testsuite.MAssertOclExpression;
+import org.tzi.use.parser.testsuite.sys.MAssert;
+import org.tzi.use.parser.testsuite.sys.MAssertOclExpression;
public class ASTAssertOclExpression extends ASTAssert {
private ASTExpression expression;
diff --git a/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTAssertPost.java b/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTAssertPost.java
index 4c8eb22ed..66bde1299 100644
--- a/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTAssertPost.java
+++ b/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTAssertPost.java
@@ -2,11 +2,11 @@
import org.antlr.runtime.Token;
import org.tzi.use.parser.Context;
-import org.tzi.use.parser.SemanticException;
+import org.tzi.use.uml.ocl.expr.SemanticException;
import org.tzi.use.uml.mm.MPrePostCondition;
import org.tzi.use.uml.sys.MOperationCall;
-import org.tzi.use.uml.sys.testsuite.MAssert;
-import org.tzi.use.uml.sys.testsuite.MAssertPost;
+import org.tzi.use.parser.testsuite.sys.MAssert;
+import org.tzi.use.parser.testsuite.sys.MAssertPost;
public class ASTAssertPost extends ASTAssert {
private Token conditionName = null;
diff --git a/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTAssertPre.java b/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTAssertPre.java
index 284caefd8..2969d48dd 100644
--- a/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTAssertPre.java
+++ b/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTAssertPre.java
@@ -5,7 +5,7 @@
import org.antlr.runtime.Token;
import org.tzi.use.parser.Context;
-import org.tzi.use.parser.SemanticException;
+import org.tzi.use.uml.ocl.expr.SemanticException;
import org.tzi.use.parser.ocl.ASTExpression;
import org.tzi.use.uml.mm.MClass;
import org.tzi.use.uml.mm.MOperation;
@@ -13,8 +13,8 @@
import org.tzi.use.uml.ocl.expr.Expression;
import org.tzi.use.uml.ocl.expr.VarDeclList;
import org.tzi.use.uml.ocl.type.Type;
-import org.tzi.use.uml.sys.testsuite.MAssert;
-import org.tzi.use.uml.sys.testsuite.MAssertPre;
+import org.tzi.use.parser.testsuite.sys.MAssert;
+import org.tzi.use.parser.testsuite.sys.MAssertPre;
public class ASTAssertPre extends ASTAssert {
diff --git a/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTAssertSingleInvariant.java b/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTAssertSingleInvariant.java
index c59990adc..0b52df48b 100644
--- a/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTAssertSingleInvariant.java
+++ b/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTAssertSingleInvariant.java
@@ -2,11 +2,11 @@
import org.antlr.runtime.Token;
import org.tzi.use.parser.Context;
-import org.tzi.use.parser.SemanticException;
+import org.tzi.use.uml.ocl.expr.SemanticException;
import org.tzi.use.uml.mm.MClass;
import org.tzi.use.uml.mm.MClassInvariant;
-import org.tzi.use.uml.sys.testsuite.MAssert;
-import org.tzi.use.uml.sys.testsuite.MAssertSingleInvariant;
+import org.tzi.use.parser.testsuite.sys.MAssert;
+import org.tzi.use.parser.testsuite.sys.MAssertSingleInvariant;
public class ASTAssertSingleInvariant extends ASTAssert {
diff --git a/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTTestCase.java b/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTTestCase.java
index 04e4cd9c7..a74b200ad 100644
--- a/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTTestCase.java
+++ b/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTTestCase.java
@@ -8,7 +8,7 @@
import org.antlr.runtime.Token;
import org.tzi.use.parser.AST;
import org.tzi.use.parser.Context;
-import org.tzi.use.parser.SemanticException;
+import org.tzi.use.uml.ocl.expr.SemanticException;
import org.tzi.use.parser.soil.ast.ASTStatement;
import org.tzi.use.uml.ocl.expr.EvalContext;
import org.tzi.use.uml.sys.MSystem;
@@ -16,9 +16,9 @@
import org.tzi.use.uml.sys.MSystemState;
import org.tzi.use.uml.sys.soil.MExitOperationStatement;
import org.tzi.use.uml.sys.soil.MStatement;
-import org.tzi.use.uml.sys.testsuite.MAssert;
+import org.tzi.use.parser.testsuite.sys.MAssert;
import org.tzi.use.util.StringUtil;
-import org.tzi.use.util.soil.exceptions.CompilationFailedException;
+import org.tzi.use.parser.soil.exceptions.CompilationFailedException;
public class ASTTestCase extends AST {
public enum TestResult {
@@ -78,7 +78,7 @@ public TestResult execute(MSystem system) throws SemanticException, MSystemExcep
MStatement mCmd;
try {
- mCmd = astCmd.generateStatement(ctx, system.getVariableEnvironment().constructSymbolTable());
+ mCmd = astCmd.generateStatement(ctx, new org.tzi.use.parser.soil.environment.SymbolTable(system.getVariableEnvironment()));
} catch (CompilationFailedException e) {
failureDetails = "Line " + astCmd.getSourcePosition().line() + ": " + astCmd.toString() + " command failed: " + e.getMessage();
return TestResult.ERROR;
diff --git a/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTTestSuite.java b/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTTestSuite.java
index ece11f7e6..1b92467af 100644
--- a/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTTestSuite.java
+++ b/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTTestSuite.java
@@ -5,9 +5,9 @@
import org.antlr.runtime.Token;
import org.tzi.use.parser.AST;
import org.tzi.use.parser.Context;
-import org.tzi.use.parser.SemanticException;
+import org.tzi.use.uml.ocl.expr.SemanticException;
import org.tzi.use.parser.soil.ast.ASTStatement;
-import org.tzi.use.uml.sys.testsuite.MTestSuite;
+import org.tzi.use.parser.testsuite.sys.MTestSuite;
public class ASTTestSuite extends AST {
diff --git a/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTVariation.java b/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTVariation.java
index fc484806e..77eda6aca 100644
--- a/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTVariation.java
+++ b/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTVariation.java
@@ -22,8 +22,8 @@
import org.antlr.runtime.Token;
import org.tzi.use.parser.AST;
import org.tzi.use.parser.Context;
-import org.tzi.use.parser.SrcPos;
-import org.tzi.use.uml.sys.testsuite.MVariation;
+import org.tzi.use.util.SrcPos;
+import org.tzi.use.parser.testsuite.sys.MVariation;
public abstract class ASTVariation extends AST {
protected SrcPos position;
diff --git a/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTVariationEnd.java b/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTVariationEnd.java
index 7b462681a..b77f79c4e 100644
--- a/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTVariationEnd.java
+++ b/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTVariationEnd.java
@@ -2,8 +2,8 @@
import org.antlr.runtime.Token;
import org.tzi.use.parser.Context;
-import org.tzi.use.uml.sys.testsuite.MVariation;
-import org.tzi.use.uml.sys.testsuite.MVariationEnd;
+import org.tzi.use.parser.testsuite.sys.MVariation;
+import org.tzi.use.parser.testsuite.sys.MVariationEnd;
public class ASTVariationEnd extends ASTVariation {
diff --git a/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTVariationStart.java b/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTVariationStart.java
index 2872c5ff8..499b6dd92 100644
--- a/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTVariationStart.java
+++ b/use-core/src/main/java/org/tzi/use/parser/testsuite/ASTVariationStart.java
@@ -2,8 +2,8 @@
import org.antlr.runtime.Token;
import org.tzi.use.parser.Context;
-import org.tzi.use.uml.sys.testsuite.MVariation;
-import org.tzi.use.uml.sys.testsuite.MVariationStart;
+import org.tzi.use.parser.testsuite.sys.MVariation;
+import org.tzi.use.parser.testsuite.sys.MVariationStart;
public class ASTVariationStart extends ASTVariation {
public ASTVariationStart(Token start) {
diff --git a/use-core/src/main/java/org/tzi/use/parser/testsuite/TestSuiteCompiler.java b/use-core/src/main/java/org/tzi/use/parser/testsuite/TestSuiteCompiler.java
index d7d0f9bdf..e1df0660c 100644
--- a/use-core/src/main/java/org/tzi/use/parser/testsuite/TestSuiteCompiler.java
+++ b/use-core/src/main/java/org/tzi/use/parser/testsuite/TestSuiteCompiler.java
@@ -10,9 +10,9 @@
import org.antlr.runtime.RecognitionException;
import org.tzi.use.parser.Context;
import org.tzi.use.parser.ParseErrorHandler;
-import org.tzi.use.parser.SemanticException;
+import org.tzi.use.uml.ocl.expr.SemanticException;
import org.tzi.use.uml.mm.MModel;
-import org.tzi.use.uml.sys.testsuite.MTestSuite;
+import org.tzi.use.parser.testsuite.sys.MTestSuite;
public class TestSuiteCompiler {
// utility class
diff --git a/use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MAssert.java b/use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MAssert.java
similarity index 89%
rename from use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MAssert.java
rename to use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MAssert.java
index 0cf701c88..bf24c4c0a 100644
--- a/use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MAssert.java
+++ b/use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MAssert.java
@@ -1,41 +1,41 @@
-package org.tzi.use.uml.sys.testsuite;
-
-import org.tzi.use.parser.SrcPos;
-import org.tzi.use.uml.ocl.expr.EvalContext;
-import org.tzi.use.uml.sys.MSystemException;
-
-public abstract class MAssert {
- private String expressionString;
- private String message;
- private SrcPos position;
- private boolean shouldBeValid;
-
- public MAssert(SrcPos position, String expressionString, String message, boolean shouldBeValid) {
- this.position = position;
- this.expressionString = expressionString;
- this.message = (message == null ? null : message.substring(1, message.length() - 1));
- this.shouldBeValid = shouldBeValid;
- }
-
- public String getExpressionString() {
- return expressionString;
- }
-
- public SrcPos getPosition() {
- return this.position;
- }
-
- public String getMessage() {
- return this.message;
- }
-
- public boolean shouldBeValid() {
- return this.shouldBeValid;
- }
-
- protected abstract boolean doEval(EvalContext ctx) throws MSystemException;
-
- public boolean eval(EvalContext ctx) throws MSystemException {
- return shouldBeValid == doEval(ctx);
- }
-}
+package org.tzi.use.parser.testsuite.sys;
+
+import org.tzi.use.util.SrcPos;
+import org.tzi.use.uml.ocl.expr.EvalContext;
+import org.tzi.use.uml.sys.MSystemException;
+
+public abstract class MAssert {
+ private String expressionString;
+ private String message;
+ private SrcPos position;
+ private boolean shouldBeValid;
+
+ public MAssert(SrcPos position, String expressionString, String message, boolean shouldBeValid) {
+ this.position = position;
+ this.expressionString = expressionString;
+ this.message = (message == null ? null : message.substring(1, message.length() - 1));
+ this.shouldBeValid = shouldBeValid;
+ }
+
+ public String getExpressionString() {
+ return expressionString;
+ }
+
+ public SrcPos getPosition() {
+ return this.position;
+ }
+
+ public String getMessage() {
+ return this.message;
+ }
+
+ public boolean shouldBeValid() {
+ return this.shouldBeValid;
+ }
+
+ protected abstract boolean doEval(EvalContext ctx) throws MSystemException;
+
+ public boolean eval(EvalContext ctx) throws MSystemException {
+ return shouldBeValid == doEval(ctx);
+ }
+}
diff --git a/use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MAssertClassInvariants.java b/use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MAssertClassInvariants.java
similarity index 88%
rename from use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MAssertClassInvariants.java
rename to use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MAssertClassInvariants.java
index c146cb84b..c2b5e21d4 100644
--- a/use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MAssertClassInvariants.java
+++ b/use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MAssertClassInvariants.java
@@ -1,40 +1,40 @@
-package org.tzi.use.uml.sys.testsuite;
-
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.tzi.use.parser.SrcPos;
-import org.tzi.use.uml.mm.MClass;
-import org.tzi.use.uml.mm.MClassInvariant;
-import org.tzi.use.uml.ocl.expr.EvalContext;
-import org.tzi.use.util.NullWriter;
-
-public class MAssertClassInvariants extends MAssert {
-
- private MClass cls;
-
- public MAssertClassInvariants(SrcPos position, String expressionString, String message, boolean shouldBeValid, MClass cls) {
- super(position, expressionString, message, shouldBeValid);
- this.cls = cls;
- }
-
- public MClass getMClass() {
- return cls;
- }
-
- @Override
- protected boolean doEval(EvalContext ctx) {
- List invs = new ArrayList();
-
- for (MClassInvariant inv : cls.model().allClassInvariants(cls)) {
- invs.add(inv.toString());
- }
-
- return ctx.postState().check(new PrintWriter(new NullWriter()),
- false,
- false,
- false, invs);
- }
-
-}
+package org.tzi.use.parser.testsuite.sys;
+
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.tzi.use.util.SrcPos;
+import org.tzi.use.uml.mm.MClass;
+import org.tzi.use.uml.mm.MClassInvariant;
+import org.tzi.use.uml.ocl.expr.EvalContext;
+import org.tzi.use.util.NullWriter;
+
+public class MAssertClassInvariants extends MAssert {
+
+ private MClass cls;
+
+ public MAssertClassInvariants(SrcPos position, String expressionString, String message, boolean shouldBeValid, MClass cls) {
+ super(position, expressionString, message, shouldBeValid);
+ this.cls = cls;
+ }
+
+ public MClass getMClass() {
+ return cls;
+ }
+
+ @Override
+ protected boolean doEval(EvalContext ctx) {
+ List invs = new ArrayList();
+
+ for (MClassInvariant inv : cls.model().allClassInvariants(cls)) {
+ invs.add(inv.toString());
+ }
+
+ return ctx.postState().check(new PrintWriter(new NullWriter()),
+ false,
+ false,
+ false, invs);
+ }
+
+}
diff --git a/use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MAssertGlobalInvariants.java b/use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MAssertGlobalInvariants.java
similarity index 84%
rename from use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MAssertGlobalInvariants.java
rename to use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MAssertGlobalInvariants.java
index ada529e45..d9e51ba8b 100644
--- a/use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MAssertGlobalInvariants.java
+++ b/use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MAssertGlobalInvariants.java
@@ -1,24 +1,24 @@
-package org.tzi.use.uml.sys.testsuite;
-
-import java.io.PrintWriter;
-
-import org.tzi.use.parser.SrcPos;
-import org.tzi.use.uml.ocl.expr.EvalContext;
-import org.tzi.use.util.NullWriter;
-
-public class MAssertGlobalInvariants extends MAssert {
-
- public MAssertGlobalInvariants(SrcPos position, String expressionString,
- String message, boolean shouldBeValid) {
- super(position, expressionString, message, shouldBeValid);
- }
-
- @Override
- protected boolean doEval(EvalContext ctx) {
- return ctx.postState().check(new PrintWriter(new NullWriter()),
- false,
- false,
- true, null);
- }
-
-}
+package org.tzi.use.parser.testsuite.sys;
+
+import java.io.PrintWriter;
+
+import org.tzi.use.util.SrcPos;
+import org.tzi.use.uml.ocl.expr.EvalContext;
+import org.tzi.use.util.NullWriter;
+
+public class MAssertGlobalInvariants extends MAssert {
+
+ public MAssertGlobalInvariants(SrcPos position, String expressionString,
+ String message, boolean shouldBeValid) {
+ super(position, expressionString, message, shouldBeValid);
+ }
+
+ @Override
+ protected boolean doEval(EvalContext ctx) {
+ return ctx.postState().check(new PrintWriter(new NullWriter()),
+ false,
+ false,
+ true, null);
+ }
+
+}
diff --git a/use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MAssertOclExpression.java b/use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MAssertOclExpression.java
similarity index 87%
rename from use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MAssertOclExpression.java
rename to use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MAssertOclExpression.java
index 520e7b999..4783f3afd 100644
--- a/use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MAssertOclExpression.java
+++ b/use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MAssertOclExpression.java
@@ -1,26 +1,26 @@
-package org.tzi.use.uml.sys.testsuite;
-
-import org.tzi.use.parser.SrcPos;
-import org.tzi.use.uml.ocl.expr.EvalContext;
-import org.tzi.use.uml.ocl.expr.Expression;
-import org.tzi.use.uml.ocl.value.BooleanValue;
-import org.tzi.use.uml.ocl.value.Value;
-
-public class MAssertOclExpression extends MAssert {
- private Expression expression;
-
- public MAssertOclExpression(SrcPos position, String expressionString, String message, boolean shouldBeValid, Expression expression) {
- super(position, expressionString, message, shouldBeValid);
- this.expression = expression;
- }
-
- protected boolean doEval(EvalContext ctx)
- {
- Value v = this.expression.eval(ctx);
-
- if (v.isBoolean())
- return ((BooleanValue)v).value();
- else
- return false;
- }
-}
+package org.tzi.use.parser.testsuite.sys;
+
+import org.tzi.use.util.SrcPos;
+import org.tzi.use.uml.ocl.expr.EvalContext;
+import org.tzi.use.uml.ocl.expr.Expression;
+import org.tzi.use.uml.ocl.value.BooleanValue;
+import org.tzi.use.uml.ocl.value.Value;
+
+public class MAssertOclExpression extends MAssert {
+ private Expression expression;
+
+ public MAssertOclExpression(SrcPos position, String expressionString, String message, boolean shouldBeValid, Expression expression) {
+ super(position, expressionString, message, shouldBeValid);
+ this.expression = expression;
+ }
+
+ protected boolean doEval(EvalContext ctx)
+ {
+ Value v = this.expression.eval(ctx);
+
+ if (v.isBoolean())
+ return ((BooleanValue)v).value();
+ else
+ return false;
+ }
+}
diff --git a/use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MAssertPost.java b/use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MAssertPost.java
similarity index 93%
rename from use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MAssertPost.java
rename to use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MAssertPost.java
index f725460e2..cfd12e01d 100644
--- a/use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MAssertPost.java
+++ b/use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MAssertPost.java
@@ -1,72 +1,72 @@
-package org.tzi.use.uml.sys.testsuite;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.tzi.use.parser.SrcPos;
-import org.tzi.use.uml.mm.MOperation;
-import org.tzi.use.uml.mm.MPrePostCondition;
-import org.tzi.use.uml.ocl.expr.EvalContext;
-import org.tzi.use.uml.ocl.expr.Evaluator;
-import org.tzi.use.uml.ocl.expr.Expression;
-import org.tzi.use.uml.ocl.value.BooleanValue;
-import org.tzi.use.uml.ocl.value.Value;
-import org.tzi.use.uml.ocl.value.VarBindings;
-import org.tzi.use.uml.sys.MOperationCall;
-import org.tzi.use.uml.sys.MSystemException;
-
-public class MAssertPost extends MAssert {
-
- private MPrePostCondition singleCondition = null;
-
- public MAssertPost(SrcPos position, String expressionString,
- String message, boolean shouldBeValid) {
- super(position, expressionString, message, shouldBeValid);
-
- }
-
- public void setCondition(MPrePostCondition condition) {
- this.singleCondition = condition;
- }
-
- @Override
- protected boolean doEval(EvalContext ctx) throws MSystemException {
- MOperationCall opcall = ctx.postState().system().getLastOperationCall();
- if (opcall == null )
- throw new MSystemException("Call stack is empty.");
-
- MOperation op = opcall.getOperation();
-
- // bind result value to result variable
- VarBindings vb = opcall.getVarBindings();
- if (op.hasResultType() ) {
- vb.push("result", opcall.getResultValue());
- }
-
- // check postconditions
- boolean postOk = true;
- List postconds;
-
- if (this.singleCondition == null) {
- postconds = op.postConditions();
- } else {
- postconds = new ArrayList();
- postconds.add(this.singleCondition);
- }
-
- for (MPrePostCondition ppc : postconds) {
- Expression expr = ppc.expression();
- Evaluator evaluator = new Evaluator();
- // evaluate in scope local to operation
- Value v = evaluator.eval(expr, opcall.getPreState(), ctx.postState(), vb, null);
- boolean ok = v.isDefined() && ((BooleanValue) v).isTrue();
-
- if (! ok ) {
- postOk = false;
- }
- }
-
- return postOk;
- }
-
-}
+package org.tzi.use.parser.testsuite.sys;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.tzi.use.util.SrcPos;
+import org.tzi.use.uml.mm.MOperation;
+import org.tzi.use.uml.mm.MPrePostCondition;
+import org.tzi.use.uml.ocl.expr.EvalContext;
+import org.tzi.use.uml.ocl.expr.Evaluator;
+import org.tzi.use.uml.ocl.expr.Expression;
+import org.tzi.use.uml.ocl.value.BooleanValue;
+import org.tzi.use.uml.ocl.value.Value;
+import org.tzi.use.uml.ocl.value.VarBindings;
+import org.tzi.use.uml.sys.MOperationCall;
+import org.tzi.use.uml.sys.MSystemException;
+
+public class MAssertPost extends MAssert {
+
+ private MPrePostCondition singleCondition = null;
+
+ public MAssertPost(SrcPos position, String expressionString,
+ String message, boolean shouldBeValid) {
+ super(position, expressionString, message, shouldBeValid);
+
+ }
+
+ public void setCondition(MPrePostCondition condition) {
+ this.singleCondition = condition;
+ }
+
+ @Override
+ protected boolean doEval(EvalContext ctx) throws MSystemException {
+ MOperationCall opcall = ctx.postState().system().getLastOperationCall();
+ if (opcall == null )
+ throw new MSystemException("Call stack is empty.");
+
+ MOperation op = opcall.getOperation();
+
+ // bind result value to result variable
+ VarBindings vb = opcall.getVarBindings();
+ if (op.hasResultType() ) {
+ vb.push("result", opcall.getResultValue());
+ }
+
+ // check postconditions
+ boolean postOk = true;
+ List postconds;
+
+ if (this.singleCondition == null) {
+ postconds = op.postConditions();
+ } else {
+ postconds = new ArrayList();
+ postconds.add(this.singleCondition);
+ }
+
+ for (MPrePostCondition ppc : postconds) {
+ Expression expr = ppc.expression();
+ Evaluator evaluator = new Evaluator();
+ // evaluate in scope local to operation
+ Value v = evaluator.eval(expr, opcall.getPreState(), ctx.postState(), vb, null);
+ boolean ok = v.isDefined() && ((BooleanValue) v).isTrue();
+
+ if (! ok ) {
+ postOk = false;
+ }
+ }
+
+ return postOk;
+ }
+
+}
diff --git a/use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MAssertPre.java b/use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MAssertPre.java
similarity index 92%
rename from use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MAssertPre.java
rename to use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MAssertPre.java
index 4974943c1..42f903692 100644
--- a/use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MAssertPre.java
+++ b/use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MAssertPre.java
@@ -1,77 +1,77 @@
-package org.tzi.use.uml.sys.testsuite;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.tzi.use.parser.SrcPos;
-import org.tzi.use.uml.mm.MOperation;
-import org.tzi.use.uml.mm.MPrePostCondition;
-import org.tzi.use.uml.ocl.expr.EvalContext;
-import org.tzi.use.uml.ocl.expr.Evaluator;
-import org.tzi.use.uml.ocl.expr.Expression;
-import org.tzi.use.uml.ocl.value.BooleanValue;
-import org.tzi.use.uml.ocl.value.ObjectValue;
-import org.tzi.use.uml.ocl.value.Value;
-import org.tzi.use.uml.ocl.value.VarBindings;
-import org.tzi.use.util.soil.VariableEnvironment;
-
-public class MAssertPre extends MAssert {
-
- private Expression objectExpr;
- private MOperation operation;
- private Expression[] args;
- private MPrePostCondition singleCondition;
-
- public MAssertPre(SrcPos position, String expressionString, String message,
- boolean shouldBeValid, Expression objectExpr, MOperation operation, Expression[] args) {
- super(position, expressionString, message, shouldBeValid);
-
- this.objectExpr = objectExpr;
- this.operation = operation;
- this.args = args;
- }
-
- public void setCondition(MPrePostCondition cnd) {
- this.singleCondition = cnd;
- }
-
- @Override
- protected boolean doEval(EvalContext ctx) {
- // check preconditions
- boolean preOk = true;
- MOperation op = this.operation;
- List preconds;
-
- if (this.singleCondition == null) {
- preconds = op.preConditions();
- } else {
- preconds = new ArrayList();
- preconds.add(this.singleCondition);
- }
-
- VariableEnvironment e = ctx.preState().system().getVariableEnvironment();
- e.pushFrame(false);
- ObjectValue self = (ObjectValue)objectExpr.eval(ctx);
- e.assign("self", self);
- Value[] argsValues = new Value[args.length];
- for (int i = 0; i < args.length; ++i) {
- argsValues[i] = args[i].eval(ctx);
- e.assign(this.operation.paramNames().get(i), argsValues[i]);
- }
- VarBindings b = e.constructVarBindings();
-
- for (MPrePostCondition ppc : preconds) {
- Expression expr = ppc.expression();
- Evaluator evaluator = new Evaluator();
- // evaluate in scope local to operation
- Value v = evaluator.eval(expr, ctx.postState(), b);
- boolean ok = v.isDefined() && ((BooleanValue) v).isTrue();
-
- if (! ok )
- preOk = false;
- }
- e.popFrame();
- return preOk;
- }
-
-}
+package org.tzi.use.parser.testsuite.sys;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.tzi.use.util.SrcPos;
+import org.tzi.use.uml.mm.MOperation;
+import org.tzi.use.uml.mm.MPrePostCondition;
+import org.tzi.use.uml.ocl.expr.EvalContext;
+import org.tzi.use.uml.ocl.expr.Evaluator;
+import org.tzi.use.uml.ocl.expr.Expression;
+import org.tzi.use.uml.ocl.value.BooleanValue;
+import org.tzi.use.uml.ocl.value.ObjectValue;
+import org.tzi.use.uml.ocl.value.Value;
+import org.tzi.use.uml.ocl.value.VarBindings;
+import org.tzi.use.uml.sys.soil.VariableEnvironment;
+
+public class MAssertPre extends MAssert {
+
+ private Expression objectExpr;
+ private MOperation operation;
+ private Expression[] args;
+ private MPrePostCondition singleCondition;
+
+ public MAssertPre(SrcPos position, String expressionString, String message,
+ boolean shouldBeValid, Expression objectExpr, MOperation operation, Expression[] args) {
+ super(position, expressionString, message, shouldBeValid);
+
+ this.objectExpr = objectExpr;
+ this.operation = operation;
+ this.args = args;
+ }
+
+ public void setCondition(MPrePostCondition cnd) {
+ this.singleCondition = cnd;
+ }
+
+ @Override
+ protected boolean doEval(EvalContext ctx) {
+ // check preconditions
+ boolean preOk = true;
+ MOperation op = this.operation;
+ List preconds;
+
+ if (this.singleCondition == null) {
+ preconds = op.preConditions();
+ } else {
+ preconds = new ArrayList();
+ preconds.add(this.singleCondition);
+ }
+
+ VariableEnvironment e = ctx.preState().system().getVariableEnvironment();
+ e.pushFrame(false);
+ ObjectValue self = (ObjectValue)objectExpr.eval(ctx);
+ e.assign("self", self);
+ Value[] argsValues = new Value[args.length];
+ for (int i = 0; i < args.length; ++i) {
+ argsValues[i] = args[i].eval(ctx);
+ e.assign(this.operation.paramNames().get(i), argsValues[i]);
+ }
+ VarBindings b = e.constructVarBindings();
+
+ for (MPrePostCondition ppc : preconds) {
+ Expression expr = ppc.expression();
+ Evaluator evaluator = new Evaluator();
+ // evaluate in scope local to operation
+ Value v = evaluator.eval(expr, ctx.postState(), b);
+ boolean ok = v.isDefined() && ((BooleanValue) v).isTrue();
+
+ if (! ok )
+ preOk = false;
+ }
+ e.popFrame();
+ return preOk;
+ }
+
+}
diff --git a/use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MAssertSingleInvariant.java b/use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MAssertSingleInvariant.java
similarity index 88%
rename from use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MAssertSingleInvariant.java
rename to use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MAssertSingleInvariant.java
index 9c0795255..ef8855092 100644
--- a/use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MAssertSingleInvariant.java
+++ b/use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MAssertSingleInvariant.java
@@ -1,33 +1,33 @@
-package org.tzi.use.uml.sys.testsuite;
-
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.tzi.use.parser.SrcPos;
-import org.tzi.use.uml.mm.MClassInvariant;
-import org.tzi.use.uml.ocl.expr.EvalContext;
-import org.tzi.use.util.NullWriter;
-
-public class MAssertSingleInvariant extends MAssert {
-
- private MClassInvariant invariant;
-
- public MAssertSingleInvariant(SrcPos position, String expressionString, String message, boolean shouldBeValid, MClassInvariant inv) {
- super(position, expressionString, message, shouldBeValid);
- this.invariant = inv;
- }
-
- @Override
- protected boolean doEval(EvalContext ctx) {
-
- List invs = new ArrayList();
- invs.add(invariant.toString());
-
- return ctx.postState().check(new PrintWriter(new NullWriter()),
- false,
- false,
- false, invs);
- }
-
-}
+package org.tzi.use.parser.testsuite.sys;
+
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.tzi.use.util.SrcPos;
+import org.tzi.use.uml.mm.MClassInvariant;
+import org.tzi.use.uml.ocl.expr.EvalContext;
+import org.tzi.use.util.NullWriter;
+
+public class MAssertSingleInvariant extends MAssert {
+
+ private MClassInvariant invariant;
+
+ public MAssertSingleInvariant(SrcPos position, String expressionString, String message, boolean shouldBeValid, MClassInvariant inv) {
+ super(position, expressionString, message, shouldBeValid);
+ this.invariant = inv;
+ }
+
+ @Override
+ protected boolean doEval(EvalContext ctx) {
+
+ List invs = new ArrayList();
+ invs.add(invariant.toString());
+
+ return ctx.postState().check(new PrintWriter(new NullWriter()),
+ false,
+ false,
+ false, invs);
+ }
+
+}
diff --git a/use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MTestSuite.java b/use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MTestSuite.java
similarity index 91%
rename from use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MTestSuite.java
rename to use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MTestSuite.java
index 083bf596a..2bb8b91f2 100644
--- a/use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MTestSuite.java
+++ b/use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MTestSuite.java
@@ -1,164 +1,164 @@
-package org.tzi.use.uml.sys.testsuite;
-
-import java.io.PrintWriter;
-import java.util.List;
-
-import org.antlr.runtime.Token;
-import org.tzi.use.parser.Context;
-import org.tzi.use.parser.soil.ast.ASTStatement;
-import org.tzi.use.parser.testsuite.ASTTestCase;
-import org.tzi.use.parser.testsuite.ASTTestCase.TestResult;
-import org.tzi.use.uml.mm.MModel;
-import org.tzi.use.uml.sys.MOperationCall;
-import org.tzi.use.uml.sys.MSystem;
-import org.tzi.use.uml.sys.MSystemException;
-import org.tzi.use.uml.sys.ppcHandling.PPCHandler;
-import org.tzi.use.uml.sys.ppcHandling.PostConditionCheckFailedException;
-import org.tzi.use.uml.sys.ppcHandling.PreConditionCheckFailedException;
-import org.tzi.use.uml.sys.soil.MStatement;
-import org.tzi.use.util.NullWriter;
-import org.tzi.use.util.soil.exceptions.CompilationFailedException;
-
-public class MTestSuite {
- private Token name;
- private MModel model;
-
- private List setupStatements;
- private List testCases;
-
- private PrintWriter output = null;
-
- public MTestSuite(Token name, MModel model, List setup, List testCases) {
- this.name = name;
- this.setupStatements = setup;
- this.testCases = testCases;
- this.model = model;
- }
-
- public String getName() {
- return name.getText();
- }
-
- public void run(PrintWriter output) {
- this.output = output;
- this.run();
- }
-
- public void run() {
- MSystem system;
- int testNr = 1;
- int failedTests = 0;
-
- for (ASTTestCase test : testCases) {
- // execute the setup statements
- try {
- system = setUp();
- } catch (Exception e) {
- System.err.println("Error during test setup:");
- System.err.println(e.getMessage());
- return;
- }
-
- report("Executing test " + testNr + "/" + testCases.size() + " `" + test.getName().getText() + "'");
-
- try {
- TestResult result = test.execute(system);
-
- if (result == TestResult.OK) {
- reportln("... success");
- } else if (result == TestResult.FAILURE) {
- reportln("... failure");
- reportln(" " + test.getFailureDetails());
- failedTests++;
- } else if (result == TestResult.ERROR) {
- reportln("... error");
- reportln(" " + test.getFailureDetails());
- return;
- }
- } catch (Exception e) {
- System.err.println("... error");
- System.err.println(" " + e.getMessage());
- return;
- }
-
- testNr++;
- }
-
- if (failedTests > 0) {
- reportln("### " + failedTests + " FAILURE" + (failedTests > 1 ? "S" : "") + " ###");
- } else {
- reportln("### OK ###");
- }
- }
-
- private MSystem setUp() throws MSystemException, CompilationFailedException {
-
- MSystem system = new MSystem(model);
- system.setRunningTestSuite(true);
- system.registerPPCHandlerOverride(new PPCHandler() {
-
- @Override
- public void handlePreConditions(MSystem system, MOperationCall operationCall)
- throws PreConditionCheckFailedException {
- // we ignore the messages in tests
- }
-
- @Override
- public void handlePostConditions(MSystem system,
- MOperationCall operationCall)
- throws PostConditionCheckFailedException {
- // we ignore the messages in tests
-
- }
-
- @Override
- public void handleTransitionsPre(MSystem system,
- MOperationCall operationCall)
- throws PreConditionCheckFailedException {
- // we ignore the messages in tests
-
- }
-
- @Override
- public void handleTransitionsPost(MSystem system,
- MOperationCall operationCall)
- throws PostConditionCheckFailedException {
- // we ignore the messages in tests
-
- }
- });
-
- Context ctx = new Context(name.getText(), output, system.varBindings(), null);
- ctx.setOut(new PrintWriter(new NullWriter()));
- ctx.setModel(model);
- ctx.setSystemState(system.state());
-
- for (ASTStatement cmd : this.setupStatements) {
- MStatement c = cmd.generateStatement(ctx, system.getVariableEnvironment().constructSymbolTable());
- if (c == null)
- return null;
-
- system.execute(c);
- }
-
- return system;
- }
-
- public String getStats() {
- return "Test suite `" + this.getName() + "' with " + testCases.size() + " test cases";
- }
-
- private void reportln(String s) {
- if (output != null) {
- output.println(s);
- output.flush();
- }
- }
-
- private void report(String s) {
- if (output != null) {
- output.print(s);
- output.flush();
- }
- }
-}
+package org.tzi.use.parser.testsuite.sys;
+
+import java.io.PrintWriter;
+import java.util.List;
+
+import org.antlr.runtime.Token;
+import org.tzi.use.parser.Context;
+import org.tzi.use.parser.soil.ast.ASTStatement;
+import org.tzi.use.parser.testsuite.ASTTestCase;
+import org.tzi.use.parser.testsuite.ASTTestCase.TestResult;
+import org.tzi.use.uml.mm.MModel;
+import org.tzi.use.uml.sys.MOperationCall;
+import org.tzi.use.uml.sys.MSystem;
+import org.tzi.use.uml.sys.MSystemException;
+import org.tzi.use.uml.sys.ppcHandling.PPCHandler;
+import org.tzi.use.uml.sys.ppcHandling.PostConditionCheckFailedException;
+import org.tzi.use.uml.sys.ppcHandling.PreConditionCheckFailedException;
+import org.tzi.use.uml.sys.soil.MStatement;
+import org.tzi.use.util.NullWriter;
+import org.tzi.use.parser.soil.exceptions.CompilationFailedException;
+
+public class MTestSuite {
+ private Token name;
+ private MModel model;
+
+ private List setupStatements;
+ private List testCases;
+
+ private PrintWriter output = null;
+
+ public MTestSuite(Token name, MModel model, List setup, List testCases) {
+ this.name = name;
+ this.setupStatements = setup;
+ this.testCases = testCases;
+ this.model = model;
+ }
+
+ public String getName() {
+ return name.getText();
+ }
+
+ public void run(PrintWriter output) {
+ this.output = output;
+ this.run();
+ }
+
+ public void run() {
+ MSystem system;
+ int testNr = 1;
+ int failedTests = 0;
+
+ for (ASTTestCase test : testCases) {
+ // execute the setup statements
+ try {
+ system = setUp();
+ } catch (Exception e) {
+ System.err.println("Error during test setup:");
+ System.err.println(e.getMessage());
+ return;
+ }
+
+ report("Executing test " + testNr + "/" + testCases.size() + " `" + test.getName().getText() + "'");
+
+ try {
+ TestResult result = test.execute(system);
+
+ if (result == TestResult.OK) {
+ reportln("... success");
+ } else if (result == TestResult.FAILURE) {
+ reportln("... failure");
+ reportln(" " + test.getFailureDetails());
+ failedTests++;
+ } else if (result == TestResult.ERROR) {
+ reportln("... error");
+ reportln(" " + test.getFailureDetails());
+ return;
+ }
+ } catch (Exception e) {
+ System.err.println("... error");
+ System.err.println(" " + e.getMessage());
+ return;
+ }
+
+ testNr++;
+ }
+
+ if (failedTests > 0) {
+ reportln("### " + failedTests + " FAILURE" + (failedTests > 1 ? "S" : "") + " ###");
+ } else {
+ reportln("### OK ###");
+ }
+ }
+
+ private MSystem setUp() throws MSystemException, CompilationFailedException {
+
+ MSystem system = new MSystem(model);
+ system.setRunningTestSuite(true);
+ system.registerPPCHandlerOverride(new PPCHandler() {
+
+ @Override
+ public void handlePreConditions(MSystem system, MOperationCall operationCall)
+ throws PreConditionCheckFailedException {
+ // we ignore the messages in tests
+ }
+
+ @Override
+ public void handlePostConditions(MSystem system,
+ MOperationCall operationCall)
+ throws PostConditionCheckFailedException {
+ // we ignore the messages in tests
+
+ }
+
+ @Override
+ public void handleTransitionsPre(MSystem system,
+ MOperationCall operationCall)
+ throws PreConditionCheckFailedException {
+ // we ignore the messages in tests
+
+ }
+
+ @Override
+ public void handleTransitionsPost(MSystem system,
+ MOperationCall operationCall)
+ throws PostConditionCheckFailedException {
+ // we ignore the messages in tests
+
+ }
+ });
+
+ Context ctx = new Context(name.getText(), output, system.varBindings(), null);
+ ctx.setOut(new PrintWriter(new NullWriter()));
+ ctx.setModel(model);
+ ctx.setSystemState(system.state());
+
+ for (ASTStatement cmd : this.setupStatements) {
+ MStatement c = cmd.generateStatement(ctx, new org.tzi.use.parser.soil.environment.SymbolTable(system.getVariableEnvironment()));
+ if (c == null)
+ return null;
+
+ system.execute(c);
+ }
+
+ return system;
+ }
+
+ public String getStats() {
+ return "Test suite `" + this.getName() + "' with " + testCases.size() + " test cases";
+ }
+
+ private void reportln(String s) {
+ if (output != null) {
+ output.println(s);
+ output.flush();
+ }
+ }
+
+ private void report(String s) {
+ if (output != null) {
+ output.print(s);
+ output.flush();
+ }
+ }
+}
diff --git a/use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MVariation.java b/use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MVariation.java
similarity index 90%
rename from use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MVariation.java
rename to use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MVariation.java
index 87c1cfe97..9d0548a7e 100644
--- a/use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MVariation.java
+++ b/use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MVariation.java
@@ -1,33 +1,33 @@
-/*
- * USE - UML based specification environment
- * Copyright (C) 1999-2010 Mark Richters, University of Bremen
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.tzi.use.uml.sys.testsuite;
-
-import org.tzi.use.parser.SrcPos;
-import org.tzi.use.uml.sys.MSystemException;
-
-public abstract class MVariation {
- protected SrcPos position;
-
- public MVariation(SrcPos pos) {
- position = pos;
- }
-
- public abstract void doExecute() throws MSystemException;
-}
+/*
+ * USE - UML based specification environment
+ * Copyright (C) 1999-2010 Mark Richters, University of Bremen
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.tzi.use.parser.testsuite.sys;
+
+import org.tzi.use.util.SrcPos;
+import org.tzi.use.uml.sys.MSystemException;
+
+public abstract class MVariation {
+ protected SrcPos position;
+
+ public MVariation(SrcPos pos) {
+ position = pos;
+ }
+
+ public abstract void doExecute() throws MSystemException;
+}
diff --git a/use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MVariationEnd.java b/use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MVariationEnd.java
similarity index 81%
rename from use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MVariationEnd.java
rename to use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MVariationEnd.java
index 31f464dc8..6479a1759 100644
--- a/use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MVariationEnd.java
+++ b/use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MVariationEnd.java
@@ -1,29 +1,29 @@
-package org.tzi.use.uml.sys.testsuite;
-
-import org.tzi.use.parser.SrcPos;
-import org.tzi.use.uml.sys.MSystem;
-import org.tzi.use.uml.sys.MSystemException;
-
-public class MVariationEnd extends MVariation {
-
- private MSystem system;
-
- public MVariationEnd(SrcPos pos, MSystem system) {
- super(pos);
- this.system = system;
- }
-
- @Override
- public void doExecute() throws MSystemException {
- system.endVariation();
- }
-
- public String name() {
- return "End variation";
- }
-
- @Override
- public String toString() {
- return name();
- }
-}
+package org.tzi.use.parser.testsuite.sys;
+
+import org.tzi.use.util.SrcPos;
+import org.tzi.use.uml.sys.MSystem;
+import org.tzi.use.uml.sys.MSystemException;
+
+public class MVariationEnd extends MVariation {
+
+ private MSystem system;
+
+ public MVariationEnd(SrcPos pos, MSystem system) {
+ super(pos);
+ this.system = system;
+ }
+
+ @Override
+ public void doExecute() throws MSystemException {
+ system.endVariation();
+ }
+
+ public String name() {
+ return "End variation";
+ }
+
+ @Override
+ public String toString() {
+ return name();
+ }
+}
diff --git a/use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MVariationStart.java b/use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MVariationStart.java
similarity index 79%
rename from use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MVariationStart.java
rename to use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MVariationStart.java
index 945f3e6c9..0d5cb8e9e 100644
--- a/use-core/src/main/java/org/tzi/use/uml/sys/testsuite/MVariationStart.java
+++ b/use-core/src/main/java/org/tzi/use/parser/testsuite/sys/MVariationStart.java
@@ -1,27 +1,27 @@
-package org.tzi.use.uml.sys.testsuite;
-
-import org.tzi.use.parser.SrcPos;
-import org.tzi.use.uml.sys.MSystem;
-
-public class MVariationStart extends MVariation {
- private MSystem system;
-
- public MVariationStart(SrcPos pos, MSystem system) {
- super(pos);
- this.system = system;
- }
-
- @Override
- public void doExecute() {
- system.beginVariation();
- }
-
- public String name() {
- return "Start variation";
- }
-
- @Override
- public String toString() {
- return name();
- }
-}
+package org.tzi.use.parser.testsuite.sys;
+
+import org.tzi.use.util.SrcPos;
+import org.tzi.use.uml.sys.MSystem;
+
+public class MVariationStart extends MVariation {
+ private MSystem system;
+
+ public MVariationStart(SrcPos pos, MSystem system) {
+ super(pos);
+ this.system = system;
+ }
+
+ @Override
+ public void doExecute() {
+ system.beginVariation();
+ }
+
+ public String name() {
+ return "Start variation";
+ }
+
+ @Override
+ public String toString() {
+ return name();
+ }
+}
diff --git a/use-core/src/main/java/org/tzi/use/parser/use/ASTAssociation.java b/use-core/src/main/java/org/tzi/use/parser/use/ASTAssociation.java
index 38f0fe93a..56c117cc5 100644
--- a/use-core/src/main/java/org/tzi/use/parser/use/ASTAssociation.java
+++ b/use-core/src/main/java/org/tzi/use/parser/use/ASTAssociation.java
@@ -21,7 +21,7 @@
import org.antlr.runtime.Token;
import org.tzi.use.parser.Context;
-import org.tzi.use.parser.SemanticException;
+import org.tzi.use.uml.ocl.expr.SemanticException;
import org.tzi.use.uml.mm.*;
import org.tzi.use.util.StringUtil;
diff --git a/use-core/src/main/java/org/tzi/use/parser/use/ASTAssociationClass.java b/use-core/src/main/java/org/tzi/use/parser/use/ASTAssociationClass.java
index c3e176637..b44031db5 100644
--- a/use-core/src/main/java/org/tzi/use/parser/use/ASTAssociationClass.java
+++ b/use-core/src/main/java/org/tzi/use/parser/use/ASTAssociationClass.java
@@ -21,8 +21,8 @@
import org.antlr.runtime.Token;
import org.tzi.use.parser.Context;
-import org.tzi.use.parser.SemanticException;
-import org.tzi.use.parser.Symtable;
+import org.tzi.use.uml.ocl.expr.SemanticException;
+import org.tzi.use.uml.ocl.expr.Symtable;
import org.tzi.use.parser.use.ASTAssociation.AssociationEndConstraintsGenerator;
import org.tzi.use.uml.mm.*;
diff --git a/use-core/src/main/java/org/tzi/use/parser/use/ASTAssociationEnd.java b/use-core/src/main/java/org/tzi/use/parser/use/ASTAssociationEnd.java
index 294523b71..610fb204e 100644
--- a/use-core/src/main/java/org/tzi/use/parser/use/ASTAssociationEnd.java
+++ b/use-core/src/main/java/org/tzi/use/parser/use/ASTAssociationEnd.java
@@ -21,8 +21,8 @@
import org.antlr.runtime.Token;
import org.tzi.use.parser.Context;
-import org.tzi.use.parser.SemanticException;
-import org.tzi.use.parser.Symtable;
+import org.tzi.use.uml.ocl.expr.SemanticException;
+import org.tzi.use.uml.ocl.expr.Symtable;
import org.tzi.use.parser.ocl.ASTElemVarsDeclaration;
import org.tzi.use.parser.ocl.ASTExpression;
import org.tzi.use.parser.ocl.ASTType;
diff --git a/use-core/src/main/java/org/tzi/use/parser/use/ASTAttribute.java b/use-core/src/main/java/org/tzi/use/parser/use/ASTAttribute.java
index 982259252..e427fd5b0 100644
--- a/use-core/src/main/java/org/tzi/use/parser/use/ASTAttribute.java
+++ b/use-core/src/main/java/org/tzi/use/parser/use/ASTAttribute.java
@@ -21,7 +21,7 @@
import org.antlr.runtime.Token;
import org.tzi.use.parser.Context;
-import org.tzi.use.parser.SemanticException;
+import org.tzi.use.uml.ocl.expr.SemanticException;
import org.tzi.use.parser.ocl.ASTExpression;
import org.tzi.use.parser.ocl.ASTType;
import org.tzi.use.uml.mm.MAttribute;
diff --git a/use-core/src/main/java/org/tzi/use/parser/use/ASTClass.java b/use-core/src/main/java/org/tzi/use/parser/use/ASTClass.java
index a9c0262ad..376fb26d6 100644
--- a/use-core/src/main/java/org/tzi/use/parser/use/ASTClass.java
+++ b/use-core/src/main/java/org/tzi/use/parser/use/ASTClass.java
@@ -24,8 +24,8 @@
import org.antlr.runtime.Token;
import org.tzi.use.parser.Context;
-import org.tzi.use.parser.SemanticException;
-import org.tzi.use.parser.Symtable;
+import org.tzi.use.uml.ocl.expr.SemanticException;
+import org.tzi.use.uml.ocl.expr.Symtable;
import org.tzi.use.parser.use.statemachines.ASTStateMachine;
import org.tzi.use.uml.mm.*;
import org.tzi.use.uml.mm.statemachines.MProtocolStateMachine;
diff --git a/use-core/src/main/java/org/tzi/use/parser/use/ASTConstraintDefinition.java b/use-core/src/main/java/org/tzi/use/parser/use/ASTConstraintDefinition.java
index 5ac240af6..4e26b6823 100644
--- a/use-core/src/main/java/org/tzi/use/parser/use/ASTConstraintDefinition.java
+++ b/use-core/src/main/java/org/tzi/use/parser/use/ASTConstraintDefinition.java
@@ -27,7 +27,7 @@
import org.antlr.runtime.Token;
import org.tzi.use.parser.AST;
import org.tzi.use.parser.Context;
-import org.tzi.use.parser.SemanticException;
+import org.tzi.use.uml.ocl.expr.SemanticException;
import org.tzi.use.parser.ocl.ASTType;
import org.tzi.use.uml.mm.MClassInvariant;
import org.tzi.use.uml.mm.MClassifier;
diff --git a/use-core/src/main/java/org/tzi/use/parser/use/ASTDataType.java b/use-core/src/main/java/org/tzi/use/parser/use/ASTDataType.java
index 6a0905be6..a7f8b8a7e 100644
--- a/use-core/src/main/java/org/tzi/use/parser/use/ASTDataType.java
+++ b/use-core/src/main/java/org/tzi/use/parser/use/ASTDataType.java
@@ -21,8 +21,8 @@
import org.antlr.runtime.Token;
import org.tzi.use.parser.Context;
-import org.tzi.use.parser.SemanticException;
-import org.tzi.use.parser.Symtable;
+import org.tzi.use.uml.ocl.expr.SemanticException;
+import org.tzi.use.uml.ocl.expr.Symtable;
import org.tzi.use.uml.mm.*;
import org.tzi.use.uml.ocl.type.Type;
import org.tzi.use.util.StringUtil;
diff --git a/use-core/src/main/java/org/tzi/use/parser/use/ASTImportStatement.java b/use-core/src/main/java/org/tzi/use/parser/use/ASTImportStatement.java
index 2b83bf282..f2b6299df 100644
--- a/use-core/src/main/java/org/tzi/use/parser/use/ASTImportStatement.java
+++ b/use-core/src/main/java/org/tzi/use/parser/use/ASTImportStatement.java
@@ -21,7 +21,7 @@
import org.tzi.use.parser.AST;
import org.tzi.use.parser.Context;
import org.tzi.use.parser.ImportContext;
-import org.tzi.use.parser.SemanticException;
+import org.tzi.use.uml.ocl.expr.SemanticException;
import org.tzi.use.uml.mm.MClassifier;
import org.tzi.use.uml.mm.MImportedModel;
import org.tzi.use.uml.mm.MInvalidModelException;
diff --git a/use-core/src/main/java/org/tzi/use/parser/use/ASTInvariantClause.java b/use-core/src/main/java/org/tzi/use/parser/use/ASTInvariantClause.java
index 90175b6db..4481a4b87 100644
--- a/use-core/src/main/java/org/tzi/use/parser/use/ASTInvariantClause.java
+++ b/use-core/src/main/java/org/tzi/use/parser/use/ASTInvariantClause.java
@@ -24,8 +24,8 @@
import org.antlr.runtime.Token;
import org.tzi.use.parser.Context;
-import org.tzi.use.parser.SemanticException;
-import org.tzi.use.parser.Symtable;
+import org.tzi.use.uml.ocl.expr.SemanticException;
+import org.tzi.use.uml.ocl.expr.Symtable;
import org.tzi.use.parser.ocl.ASTExpression;
import org.tzi.use.uml.mm.*;
import org.tzi.use.uml.ocl.expr.ExpInvalidException;
diff --git a/use-core/src/main/java/org/tzi/use/parser/use/ASTModel.java b/use-core/src/main/java/org/tzi/use/parser/use/ASTModel.java
index 885c11533..56b121478 100644
--- a/use-core/src/main/java/org/tzi/use/parser/use/ASTModel.java
+++ b/use-core/src/main/java/org/tzi/use/parser/use/ASTModel.java
@@ -22,7 +22,7 @@
import org.antlr.runtime.Token;
import org.tzi.use.parser.Context;
import org.tzi.use.parser.ImportContext;
-import org.tzi.use.parser.SemanticException;
+import org.tzi.use.uml.ocl.expr.SemanticException;
import org.tzi.use.parser.ocl.ASTEnumTypeDefinition;
import org.tzi.use.parser.use.statemachines.ASTSignal;
import org.tzi.use.uml.mm.*;
diff --git a/use-core/src/main/java/org/tzi/use/parser/use/ASTOperation.java b/use-core/src/main/java/org/tzi/use/parser/use/ASTOperation.java
index 0a9495d10..95e76a7b6 100644
--- a/use-core/src/main/java/org/tzi/use/parser/use/ASTOperation.java
+++ b/use-core/src/main/java/org/tzi/use/parser/use/ASTOperation.java
@@ -24,8 +24,8 @@
import org.antlr.runtime.Token;
import org.tzi.use.parser.Context;
-import org.tzi.use.parser.SemanticException;
-import org.tzi.use.parser.Symtable;
+import org.tzi.use.uml.ocl.expr.SemanticException;
+import org.tzi.use.uml.ocl.expr.Symtable;
import org.tzi.use.parser.ocl.ASTExpression;
import org.tzi.use.parser.ocl.ASTType;
import org.tzi.use.parser.ocl.ASTVariableDeclaration;
@@ -39,7 +39,7 @@
import org.tzi.use.uml.sys.soil.MEmptyStatement;
import org.tzi.use.uml.sys.soil.MStatement;
import org.tzi.use.util.StringUtil;
-import org.tzi.use.util.soil.exceptions.CompilationFailedException;
+import org.tzi.use.parser.soil.exceptions.CompilationFailedException;
/**
diff --git a/use-core/src/main/java/org/tzi/use/parser/use/ASTPrePost.java b/use-core/src/main/java/org/tzi/use/parser/use/ASTPrePost.java
index 016614557..bb4044a44 100644
--- a/use-core/src/main/java/org/tzi/use/parser/use/ASTPrePost.java
+++ b/use-core/src/main/java/org/tzi/use/parser/use/ASTPrePost.java
@@ -25,8 +25,8 @@
import org.antlr.runtime.Token;
import org.tzi.use.parser.AST;
import org.tzi.use.parser.Context;
-import org.tzi.use.parser.SemanticException;
-import org.tzi.use.parser.Symtable;
+import org.tzi.use.uml.ocl.expr.SemanticException;
+import org.tzi.use.uml.ocl.expr.Symtable;
import org.tzi.use.parser.ocl.ASTType;
import org.tzi.use.parser.ocl.ASTVariableDeclaration;
import org.tzi.use.uml.mm.MClass;
diff --git a/use-core/src/main/java/org/tzi/use/parser/use/ASTPrePostClause.java b/use-core/src/main/java/org/tzi/use/parser/use/ASTPrePostClause.java
index 35f355b23..5b64e4b19 100644
--- a/use-core/src/main/java/org/tzi/use/parser/use/ASTPrePostClause.java
+++ b/use-core/src/main/java/org/tzi/use/parser/use/ASTPrePostClause.java
@@ -21,8 +21,8 @@
import org.antlr.runtime.Token;
import org.tzi.use.parser.Context;
-import org.tzi.use.parser.SemanticException;
-import org.tzi.use.parser.Symtable;
+import org.tzi.use.uml.ocl.expr.SemanticException;
+import org.tzi.use.uml.ocl.expr.Symtable;
import org.tzi.use.parser.ocl.ASTExpression;
import org.tzi.use.uml.mm.*;
import org.tzi.use.uml.ocl.expr.ExpInvalidException;
diff --git a/use-core/src/main/java/org/tzi/use/parser/use/statemachines/ASTProtocolStateMachine.java b/use-core/src/main/java/org/tzi/use/parser/use/statemachines/ASTProtocolStateMachine.java
index 2c53e8097..b37103563 100644
--- a/use-core/src/main/java/org/tzi/use/parser/use/statemachines/ASTProtocolStateMachine.java
+++ b/use-core/src/main/java/org/tzi/use/parser/use/statemachines/ASTProtocolStateMachine.java
@@ -19,8 +19,8 @@
package org.tzi.use.parser.use.statemachines;
import org.tzi.use.parser.Context;
-import org.tzi.use.parser.SemanticException;
-import org.tzi.use.parser.SrcPos;
+import org.tzi.use.uml.ocl.expr.SemanticException;
+import org.tzi.use.util.SrcPos;
import org.tzi.use.uml.mm.statemachines.MProtocolStateMachine;
import org.tzi.use.uml.mm.statemachines.MPseudoState;
import org.tzi.use.uml.mm.statemachines.MPseudoStateKind;
diff --git a/use-core/src/main/java/org/tzi/use/parser/use/statemachines/ASTSignal.java b/use-core/src/main/java/org/tzi/use/parser/use/statemachines/ASTSignal.java
index 5b49e5581..eb89dbf5f 100644
--- a/use-core/src/main/java/org/tzi/use/parser/use/statemachines/ASTSignal.java
+++ b/use-core/src/main/java/org/tzi/use/parser/use/statemachines/ASTSignal.java
@@ -21,7 +21,7 @@
import org.antlr.runtime.Token;
import org.tzi.use.parser.Context;
-import org.tzi.use.parser.SemanticException;
+import org.tzi.use.uml.ocl.expr.SemanticException;
import org.tzi.use.parser.use.ASTAttribute;
import org.tzi.use.parser.use.ASTClassifier;
import org.tzi.use.parser.use.ASTInvariantClause;
diff --git a/use-core/src/main/java/org/tzi/use/parser/use/statemachines/ASTStateDefinition.java b/use-core/src/main/java/org/tzi/use/parser/use/statemachines/ASTStateDefinition.java
index 71a1a76df..31922981b 100644
--- a/use-core/src/main/java/org/tzi/use/parser/use/statemachines/ASTStateDefinition.java
+++ b/use-core/src/main/java/org/tzi/use/parser/use/statemachines/ASTStateDefinition.java
@@ -21,8 +21,8 @@
import org.antlr.runtime.Token;
import org.tzi.use.parser.AST;
import org.tzi.use.parser.Context;
-import org.tzi.use.parser.SemanticException;
-import org.tzi.use.parser.Symtable;
+import org.tzi.use.uml.ocl.expr.SemanticException;
+import org.tzi.use.uml.ocl.expr.Symtable;
import org.tzi.use.parser.ocl.ASTExpression;
import org.tzi.use.uml.mm.MClassifier;
import org.tzi.use.uml.mm.statemachines.MFinalState;
diff --git a/use-core/src/main/java/org/tzi/use/parser/use/statemachines/ASTStateMachine.java b/use-core/src/main/java/org/tzi/use/parser/use/statemachines/ASTStateMachine.java
index cde4b0ae6..a0a250b62 100644
--- a/use-core/src/main/java/org/tzi/use/parser/use/statemachines/ASTStateMachine.java
+++ b/use-core/src/main/java/org/tzi/use/parser/use/statemachines/ASTStateMachine.java
@@ -21,8 +21,8 @@
import org.antlr.runtime.Token;
import org.tzi.use.parser.AST;
import org.tzi.use.parser.Context;
-import org.tzi.use.parser.SemanticException;
-import org.tzi.use.parser.SrcPos;
+import org.tzi.use.uml.ocl.expr.SemanticException;
+import org.tzi.use.util.SrcPos;
import org.tzi.use.uml.mm.statemachines.MStateMachine;
import java.util.HashSet;
diff --git a/use-core/src/main/java/org/tzi/use/parser/use/statemachines/ASTTransitionDefinition.java b/use-core/src/main/java/org/tzi/use/parser/use/statemachines/ASTTransitionDefinition.java
index bc4e30149..5aafe796d 100644
--- a/use-core/src/main/java/org/tzi/use/parser/use/statemachines/ASTTransitionDefinition.java
+++ b/use-core/src/main/java/org/tzi/use/parser/use/statemachines/ASTTransitionDefinition.java
@@ -23,8 +23,8 @@
import org.antlr.runtime.Token;
import org.tzi.use.parser.AST;
import org.tzi.use.parser.Context;
-import org.tzi.use.parser.SemanticException;
-import org.tzi.use.parser.Symtable;
+import org.tzi.use.uml.ocl.expr.SemanticException;
+import org.tzi.use.uml.ocl.expr.Symtable;
import org.tzi.use.parser.ocl.ASTExpression;
import org.tzi.use.parser.ocl.ASTVariableDeclaration;
import org.tzi.use.uml.mm.MClassifier;
diff --git a/use-core/src/main/java/org/tzi/use/uml/mm/MMPrintVisitor.java b/use-core/src/main/java/org/tzi/use/uml/mm/MMPrintVisitor.java
index 3beb6166e..225680f4a 100644
--- a/use-core/src/main/java/org/tzi/use/uml/mm/MMPrintVisitor.java
+++ b/use-core/src/main/java/org/tzi/use/uml/mm/MMPrintVisitor.java
@@ -26,8 +26,8 @@
import org.tzi.use.uml.ocl.type.EnumType;
import org.tzi.use.uml.sys.soil.MStatement;
import org.tzi.use.util.StringUtil;
-import org.tzi.use.util.uml.sorting.UseFileOrderComparator;
-import org.tzi.use.util.uml.sorting.UseModelElementFileOrderComparator;
+import org.tzi.use.uml.sys.sorting.UseFileOrderComparator;
+import org.tzi.use.uml.sys.sorting.UseModelElementFileOrderComparator;
import java.io.PrintWriter;
import java.util.*;
diff --git a/use-core/src/main/java/org/tzi/use/uml/mm/commonbehavior/communications/MCallEvent.java b/use-core/src/main/java/org/tzi/use/uml/mm/commonbehavior/communications/MCallEvent.java
index 865b3fe94..d736aa9e8 100644
--- a/use-core/src/main/java/org/tzi/use/uml/mm/commonbehavior/communications/MCallEvent.java
+++ b/use-core/src/main/java/org/tzi/use/uml/mm/commonbehavior/communications/MCallEvent.java
@@ -18,9 +18,9 @@
*/
package org.tzi.use.uml.mm.commonbehavior.communications;
-import org.tzi.use.parser.ExprContext;
-import org.tzi.use.parser.SemanticException;
-import org.tzi.use.parser.Symtable;
+import org.tzi.use.uml.ocl.expr.ExprContext;
+import org.tzi.use.uml.ocl.expr.SemanticException;
+import org.tzi.use.uml.ocl.expr.Symtable;
import org.tzi.use.uml.mm.MOperation;
import org.tzi.use.uml.ocl.expr.VarDecl;
diff --git a/use-core/src/main/java/org/tzi/use/uml/mm/commonbehavior/communications/MEvent.java b/use-core/src/main/java/org/tzi/use/uml/mm/commonbehavior/communications/MEvent.java
index e41866b7d..5b4eb8d46 100644
--- a/use-core/src/main/java/org/tzi/use/uml/mm/commonbehavior/communications/MEvent.java
+++ b/use-core/src/main/java/org/tzi/use/uml/mm/commonbehavior/communications/MEvent.java
@@ -18,9 +18,9 @@
*/
package org.tzi.use.uml.mm.commonbehavior.communications;
-import org.tzi.use.parser.ExprContext;
-import org.tzi.use.parser.SemanticException;
-import org.tzi.use.parser.Symtable;
+import org.tzi.use.uml.ocl.expr.ExprContext;
+import org.tzi.use.uml.ocl.expr.SemanticException;
+import org.tzi.use.uml.ocl.expr.Symtable;
import org.tzi.use.uml.mm.MNamedElement;
/**
diff --git a/use-core/src/main/java/org/tzi/use/uml/mm/commonbehavior/communications/MTrigger.java b/use-core/src/main/java/org/tzi/use/uml/mm/commonbehavior/communications/MTrigger.java
index 4ebae79e2..01193962c 100644
--- a/use-core/src/main/java/org/tzi/use/uml/mm/commonbehavior/communications/MTrigger.java
+++ b/use-core/src/main/java/org/tzi/use/uml/mm/commonbehavior/communications/MTrigger.java
@@ -18,9 +18,9 @@
*/
package org.tzi.use.uml.mm.commonbehavior.communications;
-import org.tzi.use.parser.ExprContext;
-import org.tzi.use.parser.SemanticException;
-import org.tzi.use.parser.Symtable;
+import org.tzi.use.uml.ocl.expr.ExprContext;
+import org.tzi.use.uml.ocl.expr.SemanticException;
+import org.tzi.use.uml.ocl.expr.Symtable;
import org.tzi.use.uml.mm.MClassifier;
import org.tzi.use.uml.mm.MNamedElement;
import org.tzi.use.uml.mm.MOperation;
diff --git a/use-core/src/main/java/org/tzi/use/uml/mm/statemachines/MProtocolStateMachine.java b/use-core/src/main/java/org/tzi/use/uml/mm/statemachines/MProtocolStateMachine.java
index 034862be3..b86c76755 100644
--- a/use-core/src/main/java/org/tzi/use/uml/mm/statemachines/MProtocolStateMachine.java
+++ b/use-core/src/main/java/org/tzi/use/uml/mm/statemachines/MProtocolStateMachine.java
@@ -18,7 +18,7 @@
*/
package org.tzi.use.uml.mm.statemachines;
-import org.tzi.use.parser.SrcPos;
+import org.tzi.use.util.SrcPos;
import org.tzi.use.uml.mm.MClassifier;
import org.tzi.use.uml.mm.MOperation;
import org.tzi.use.uml.sys.MObject;
diff --git a/use-core/src/main/java/org/tzi/use/uml/mm/statemachines/MStateMachine.java b/use-core/src/main/java/org/tzi/use/uml/mm/statemachines/MStateMachine.java
index dd0326bc9..d88f21318 100644
--- a/use-core/src/main/java/org/tzi/use/uml/mm/statemachines/MStateMachine.java
+++ b/use-core/src/main/java/org/tzi/use/uml/mm/statemachines/MStateMachine.java
@@ -22,7 +22,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.tzi.use.parser.SrcPos;
+import org.tzi.use.util.SrcPos;
import org.tzi.use.uml.mm.MClassifier;
import org.tzi.use.uml.mm.MNamedElement;
import org.tzi.use.uml.mm.UseFileLocatable;
diff --git a/use-core/src/main/java/org/tzi/use/uml/ocl/expr/ExpSelectByKind.java b/use-core/src/main/java/org/tzi/use/uml/ocl/expr/ExpSelectByKind.java
index d988e47cb..793a81c62 100644
--- a/use-core/src/main/java/org/tzi/use/uml/ocl/expr/ExpSelectByKind.java
+++ b/use-core/src/main/java/org/tzi/use/uml/ocl/expr/ExpSelectByKind.java
@@ -22,7 +22,6 @@
import java.util.LinkedList;
import java.util.List;
-import org.tzi.use.parser.SemanticException;
import org.tzi.use.uml.ocl.type.CollectionType;
import org.tzi.use.uml.ocl.type.Type;
import org.tzi.use.uml.ocl.type.Type.VoidHandling;
diff --git a/use-core/src/main/java/org/tzi/use/uml/ocl/expr/ExpSelectByType.java b/use-core/src/main/java/org/tzi/use/uml/ocl/expr/ExpSelectByType.java
index 3b408d5bf..d1d094926 100644
--- a/use-core/src/main/java/org/tzi/use/uml/ocl/expr/ExpSelectByType.java
+++ b/use-core/src/main/java/org/tzi/use/uml/ocl/expr/ExpSelectByType.java
@@ -19,7 +19,6 @@
package org.tzi.use.uml.ocl.expr;
-import org.tzi.use.parser.SemanticException;
import org.tzi.use.uml.ocl.type.Type;
import org.tzi.use.uml.ocl.value.Value;
diff --git a/use-core/src/main/java/org/tzi/use/parser/ExprContext.java b/use-core/src/main/java/org/tzi/use/uml/ocl/expr/ExprContext.java
similarity index 98%
rename from use-core/src/main/java/org/tzi/use/parser/ExprContext.java
rename to use-core/src/main/java/org/tzi/use/uml/ocl/expr/ExprContext.java
index e534f73e4..a7ddcece9 100644
--- a/use-core/src/main/java/org/tzi/use/parser/ExprContext.java
+++ b/use-core/src/main/java/org/tzi/use/uml/ocl/expr/ExprContext.java
@@ -17,7 +17,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-package org.tzi.use.parser;
+package org.tzi.use.uml.ocl.expr;
import java.util.Stack;
diff --git a/use-core/src/main/java/org/tzi/use/uml/ocl/expr/Expression.java b/use-core/src/main/java/org/tzi/use/uml/ocl/expr/Expression.java
index 33109d20d..d84fab4ec 100644
--- a/use-core/src/main/java/org/tzi/use/uml/ocl/expr/Expression.java
+++ b/use-core/src/main/java/org/tzi/use/uml/ocl/expr/Expression.java
@@ -19,7 +19,7 @@
package org.tzi.use.uml.ocl.expr;
-import org.tzi.use.parser.SrcPos;
+import org.tzi.use.util.SrcPos;
import org.tzi.use.uml.ocl.type.Type;
import org.tzi.use.uml.ocl.type.TypeFactory;
import org.tzi.use.uml.ocl.value.Value;
diff --git a/use-core/src/main/java/org/tzi/use/parser/SemanticException.java b/use-core/src/main/java/org/tzi/use/uml/ocl/expr/SemanticException.java
similarity index 97%
rename from use-core/src/main/java/org/tzi/use/parser/SemanticException.java
rename to use-core/src/main/java/org/tzi/use/uml/ocl/expr/SemanticException.java
index b9980915c..585aa86aa 100644
--- a/use-core/src/main/java/org/tzi/use/parser/SemanticException.java
+++ b/use-core/src/main/java/org/tzi/use/uml/ocl/expr/SemanticException.java
@@ -17,7 +17,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-package org.tzi.use.parser;
+package org.tzi.use.uml.ocl.expr;
+import org.tzi.use.util.SrcPos;
import org.antlr.runtime.Token;
diff --git a/use-core/src/main/java/org/tzi/use/parser/Symtable.java b/use-core/src/main/java/org/tzi/use/uml/ocl/expr/Symtable.java
similarity index 98%
rename from use-core/src/main/java/org/tzi/use/parser/Symtable.java
rename to use-core/src/main/java/org/tzi/use/uml/ocl/expr/Symtable.java
index bd9620523..29095b4ed 100644
--- a/use-core/src/main/java/org/tzi/use/parser/Symtable.java
+++ b/use-core/src/main/java/org/tzi/use/uml/ocl/expr/Symtable.java
@@ -17,7 +17,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-package org.tzi.use.parser;
+package org.tzi.use.uml.ocl.expr;
+import org.tzi.use.util.SrcPos;
import java.util.HashMap;
import java.util.Map;
@@ -138,4 +139,4 @@ public Type lookup(String name) {
return null;
}
-}
\ No newline at end of file
+}
diff --git a/use-core/src/main/java/org/tzi/use/uml/ocl/expr/VarDecl.java b/use-core/src/main/java/org/tzi/use/uml/ocl/expr/VarDecl.java
index f8bccb120..d2428d53a 100644
--- a/use-core/src/main/java/org/tzi/use/uml/ocl/expr/VarDecl.java
+++ b/use-core/src/main/java/org/tzi/use/uml/ocl/expr/VarDecl.java
@@ -20,7 +20,7 @@
package org.tzi.use.uml.ocl.expr;
import org.antlr.runtime.Token;
-import org.tzi.use.parser.SrcPos;
+import org.tzi.use.util.SrcPos;
import org.tzi.use.uml.ocl.type.Type;
/**
diff --git a/use-core/src/main/java/org/tzi/use/uml/ocl/expr/VarDeclList.java b/use-core/src/main/java/org/tzi/use/uml/ocl/expr/VarDeclList.java
index def030536..ca38787b8 100644
--- a/use-core/src/main/java/org/tzi/use/uml/ocl/expr/VarDeclList.java
+++ b/use-core/src/main/java/org/tzi/use/uml/ocl/expr/VarDeclList.java
@@ -19,8 +19,6 @@
package org.tzi.use.uml.ocl.expr;
-import org.tzi.use.parser.SemanticException;
-import org.tzi.use.parser.Symtable;
import org.tzi.use.util.StringUtil;
import java.util.ArrayList;
diff --git a/use-core/src/main/java/org/tzi/use/uml/ocl/extension/ExtensionManager.java b/use-core/src/main/java/org/tzi/use/uml/ocl/extension/ExtensionManager.java
index e24db7516..533763ce0 100644
--- a/use-core/src/main/java/org/tzi/use/uml/ocl/extension/ExtensionManager.java
+++ b/use-core/src/main/java/org/tzi/use/uml/ocl/extension/ExtensionManager.java
@@ -9,7 +9,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.tzi.use.parser.ocl.OCLCompiler;
import org.tzi.use.uml.mm.MModel;
import org.tzi.use.uml.mm.ModelFactory;
import org.tzi.use.uml.ocl.expr.ExpStdOp;
@@ -39,6 +38,12 @@ public class ExtensionManager {
*/
private String rubyMethodCallLibrary = null;
+ /**
+ * The type compiler used to resolve type names from extension definitions.
+ * Must be set before calling loadExtensions().
+ */
+ private TypeCompiler typeCompiler;
+
private ExtensionManager() {}
public static ExtensionManager getInstance() {
@@ -49,6 +54,16 @@ public static ExtensionManager getInstance() {
return ExtensionManager.INSTANCE;
}
+ /**
+ * Sets the type compiler used to resolve type names.
+ * This must be called before loadExtensions().
+ *
+ * @param typeCompiler the compiler to use for resolving type names
+ */
+ public void setTypeCompiler(TypeCompiler typeCompiler) {
+ this.typeCompiler = typeCompiler;
+ }
+
public String getRubyMethodCallLibrary() {
return rubyMethodCallLibrary;
}
@@ -57,6 +72,10 @@ public String getRubyMethodCallLibrary() {
* Loads the extensions specified in EXTENSION_FOLDER
*/
public void loadExtensions() {
+ if (this.typeCompiler == null) {
+ throw new IllegalStateException("TypeCompiler has not been set. Call setTypeCompiler() before loadExtensions().");
+ }
+
File extensionDir = new File(EXTENSIONS_FOLDER);
if (!extensionDir.isDirectory()) {
Log.warn("Invalid extension directory '" + ExtensionManager.EXTENSIONS_FOLDER + "'");
@@ -186,6 +205,9 @@ private ExtensionOperation loadOperation(VTDNav vn) throws NavException {
}
protected Type getType(String typeName) {
- return OCLCompiler.compileType(emptyModel, typeName, "Extension type", error);
+ if (typeCompiler == null) {
+ throw new IllegalStateException("TypeCompiler has not been set. Call setTypeCompiler() before loadExtensions().");
+ }
+ return typeCompiler.compileType(emptyModel, typeName, "Extension type", error);
}
}
diff --git a/use-core/src/main/java/org/tzi/use/uml/ocl/extension/ExtensionOperation.java b/use-core/src/main/java/org/tzi/use/uml/ocl/extension/ExtensionOperation.java
index 8983c29ea..6090c1a6c 100644
--- a/use-core/src/main/java/org/tzi/use/uml/ocl/extension/ExtensionOperation.java
+++ b/use-core/src/main/java/org/tzi/use/uml/ocl/extension/ExtensionOperation.java
@@ -7,8 +7,6 @@
import org.tzi.use.uml.ocl.value.UndefinedValue;
import org.tzi.use.uml.ocl.value.Value;
import org.tzi.use.util.Log;
-import org.tzi.use.util.rubyintegration.RubyHelper;
-
import javax.script.ScriptContext;
import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
diff --git a/use-core/src/main/java/org/tzi/use/util/rubyintegration/RubyHelper.java b/use-core/src/main/java/org/tzi/use/uml/ocl/extension/RubyHelper.java
similarity index 96%
rename from use-core/src/main/java/org/tzi/use/util/rubyintegration/RubyHelper.java
rename to use-core/src/main/java/org/tzi/use/uml/ocl/extension/RubyHelper.java
index 8fcb964fe..aee3cb559 100644
--- a/use-core/src/main/java/org/tzi/use/util/rubyintegration/RubyHelper.java
+++ b/use-core/src/main/java/org/tzi/use/uml/ocl/extension/RubyHelper.java
@@ -1,143 +1,143 @@
-package org.tzi.use.util.rubyintegration;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.tzi.use.uml.ocl.expr.ExpConstBoolean;
-import org.tzi.use.uml.ocl.expr.ExpConstInteger;
-import org.tzi.use.uml.ocl.expr.ExpConstReal;
-import org.tzi.use.uml.ocl.expr.ExpConstString;
-import org.tzi.use.uml.ocl.expr.ExpUndefined;
-import org.tzi.use.uml.ocl.expr.Expression;
-import org.tzi.use.uml.ocl.expr.ExpressionWithValue;
-import org.tzi.use.uml.ocl.type.CollectionType;
-import org.tzi.use.uml.ocl.type.Type;
-import org.tzi.use.uml.ocl.type.Type.VoidHandling;
-import org.tzi.use.uml.ocl.value.BooleanValue;
-import org.tzi.use.uml.ocl.value.CollectionValue;
-import org.tzi.use.uml.ocl.value.IntegerValue;
-import org.tzi.use.uml.ocl.value.ObjectValue;
-import org.tzi.use.uml.ocl.value.RealValue;
-import org.tzi.use.uml.ocl.value.StringValue;
-import org.tzi.use.uml.ocl.value.UndefinedValue;
-import org.tzi.use.uml.ocl.value.Value;
-import org.tzi.use.uml.sys.MObject;
-import org.tzi.use.util.Log;
-
-public class RubyHelper {
- private RubyHelper() {}
-
- public static Value rubyValueToUseValue(Object rubyValue, Type expectedType) {
- Value result = UndefinedValue.instance;
-
- if (rubyValue == null) return result;
-
- if (rubyValue instanceof Value) {
- result = (Value)rubyValue;
- } else if (rubyValue instanceof Long) {
- result = IntegerValue.valueOf(((Long) rubyValue).intValue());
- } else if (rubyValue instanceof Integer) {
- result = IntegerValue.valueOf(((Integer) rubyValue).intValue());
- } else if (rubyValue instanceof String) {
- result = new StringValue((String)rubyValue);
- } else if (rubyValue instanceof Boolean) {
- result = BooleanValue.get(((Boolean)rubyValue).booleanValue());
- } else if (rubyValue instanceof Double) {
- result = new RealValue(((Double)rubyValue).doubleValue());
- } else if (rubyValue instanceof MObject) {
- MObject obj = (MObject)rubyValue;
- result = new ObjectValue(obj.cls(), obj);
- } else if (rubyValue instanceof List && expectedType.isKindOfCollection(VoidHandling.EXCLUDE_VOID)) {
- List list = (List)rubyValue;
- Value[] elements = new Value[list.size()];
-
- for (int index = 0; index < list.size(); index++) {
- elements[index] = rubyValueToUseValue(list.get(index), ((CollectionType)expectedType).elemType());
- }
-
- CollectionType expectedCollectionType = (CollectionType)expectedType;
- result = expectedCollectionType.createCollectionValue(elements);
- } else {
- Log.warn("rubyValueToUseValue: Unhandeled Ruby value: " + rubyValue.toString());
- }
-
- if (result.type().conformsTo(expectedType)) {
- return result;
- } else {
- Log.warn("rubyValueToUseValue: converted type of value (`"
- + result.type().toString()
- + "') is not a subtype of the expected result type (`"
- + expectedType.toString() + "'");
- return UndefinedValue.instance;
- }
- }
-
- public static Object useValueToRubyValue(Value useValue) {
- if (useValue instanceof UndefinedValue) {
- return null;
- }
- if (useValue instanceof StringValue) {
- return ((StringValue)useValue).value();
- }
- if (useValue instanceof RealValue) {
- return ((RealValue)useValue).value();
- }
- if (useValue instanceof IntegerValue) {
- return ((IntegerValue)useValue).value();
- }
- if (useValue instanceof BooleanValue) {
- return ((BooleanValue)useValue).value();
- }
- if (useValue instanceof ObjectValue) {
- return ((ObjectValue)useValue).value();
- }
- if (useValue instanceof CollectionValue) {
- CollectionValue col = (CollectionValue)useValue;
- List