org.eclipselabs.mscript.computation.engine renamed to org.eclipselabs.mscript.computation.core.

org.eclipselabs.mscript/features/org.eclipselabs.mscript-feature/feature.xml

@@ -82,7 +82,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipselabs.mscript.computation.engine"
+         id="org.eclipselabs.mscript.computation.core"
          download-size="0"
          install-size="0"
          version="0.0.0"

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.codegen.c.ide.core/META-INF/MANIFEST.MF

@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.debug.core;bundle-version="3.6.0",
  org.eclipselabs.mscript.language;bundle-version="0.1.0",
  org.eclipselabs.mscript.codegen.c;bundle-version="0.1.0",
- org.eclipselabs.mscript.computation.engine;bundle-version="0.1.0",
+ org.eclipselabs.mscript.computation.core;bundle-version="0.1.0",
  org.eclipselabs.mscript.computation.computationmodel;bundle-version="0.1.0",
  org.eclipselabs.mscript.ide.core;bundle-version="0.1.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.codegen.c.ide.core/src/org/eclipselabs/mscript/codegen/c/ide/core/launch/CodegenLaunchConfigurationDelegate.java

@@ -12,7 +12,7 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipselabs.mscript.codegen.c.ide.core.CodegenCIDECorePlugin;
-import org.eclipselabs.mscript.computation.engine.ComputationContext;
+import org.eclipselabs.mscript.computation.core.ComputationContext;
 import org.eclipselabs.mscript.ide.core.launch.AbstractMscriptLaunchConfigurationDelegate;
 import org.eclipselabs.mscript.language.il.Compound;
 import org.eclipselabs.mscript.language.il.transform.ArrayOperationDecomposer;

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.codegen.c/META-INF/MANIFEST.MF

@@ -8,7 +8,7 @@ Bundle-Vendor: Mscript Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipselabs.mscript.common;bundle-version="0.1.0",
  org.eclipselabs.mscript.language;bundle-version="0.1.0",
- org.eclipselabs.mscript.computation.engine;bundle-version="0.1.0",
+ org.eclipselabs.mscript.computation.core;bundle-version="0.1.0",
  org.eclipselabs.mscript.computation.computationmodel;bundle-version="0.1.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.codegen.c/src/org/eclipselabs/mscript/codegen/c/internal/VariableAccessGenerator.java

@@ -3,10 +3,10 @@ package org.eclipselabs.mscript.codegen.c.internal;
 import org.eclipselabs.mscript.codegen.c.IVariableAccessStrategy;
 import org.eclipselabs.mscript.codegen.c.util.MscriptGeneratorUtil;
 import org.eclipselabs.mscript.computation.computationmodel.ComputationModel;
-import org.eclipselabs.mscript.computation.engine.value.IArrayValue;
-import org.eclipselabs.mscript.computation.engine.value.IBooleanValue;
-import org.eclipselabs.mscript.computation.engine.value.ISimpleNumericValue;
-import org.eclipselabs.mscript.computation.engine.value.IValue;
+import org.eclipselabs.mscript.computation.core.value.IArrayValue;
+import org.eclipselabs.mscript.computation.core.value.IBooleanValue;
+import org.eclipselabs.mscript.computation.core.value.ISimpleNumericValue;
+import org.eclipselabs.mscript.computation.core.value.IValue;
 import org.eclipselabs.mscript.language.ast.Expression;
 import org.eclipselabs.mscript.language.ast.IntegerLiteral;
 import org.eclipselabs.mscript.language.il.LocalVariableDeclaration;

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipselabs.mscript.computation.engine</name>
+	<name>org.eclipselabs.mscript.computation.core</name>
 	<comment></comment>
 	<projects>
 	</projects>

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/META-INF/MANIFEST.MF

@@ -1,14 +1,14 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mscript Computation Engine
-Bundle-SymbolicName: org.eclipselabs.mscript.computation.engine;singleton:=true
+Bundle-SymbolicName: org.eclipselabs.mscript.computation.core;singleton:=true
 Bundle-Version: 0.1.0.qualifier
-Bundle-Activator: org.eclipselabs.mscript.computation.engine.ComputationEnginePlugin
+Bundle-Activator: org.eclipselabs.mscript.computation.core.ComputationEnginePlugin
 Bundle-Vendor: Mscript Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipselabs.mscript.typesystem;bundle-version="0.1.0";visibility:=reexport,
  org.eclipselabs.mscript.computation.computationmodel;bundle-version="0.1.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipselabs.mscript.computation.engine,
- org.eclipselabs.mscript.computation.engine.value
+Export-Package: org.eclipselabs.mscript.computation.core,
+ org.eclipselabs.mscript.computation.core.value

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/ComputationContext.java

@@ -9,7 +9,7 @@
  *    Andreas Unger - initial API and implementation 
  ****************************************************************************/
 
-package org.eclipselabs.mscript.computation.engine;
+package org.eclipselabs.mscript.computation.core;
 
 import org.eclipselabs.mscript.computation.computationmodel.ComputationModel;
 import org.eclipselabs.mscript.computation.computationmodel.util.ComputationModelUtil;
@@ -38,14 +38,14 @@ public class ComputationContext implements IComputationContext {
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipselabs.mscript.computation.engine.IComputationContext#getComputationModel()
+	 * @see org.eclipselabs.mscript.computation.core.IComputationContext#getComputationModel()
 	 */
 	public ComputationModel getComputationModel() {
 		return computationModel;
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipselabs.mscript.computation.engine.IComputationContext#getOverflowMonitor()
+	 * @see org.eclipselabs.mscript.computation.core.IComputationContext#getOverflowMonitor()
 	 */
 	public IOverflowMonitor getOverflowMonitor() {
 		return overflowMonitor;

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/ComputationEnginePlugin.java

@@ -1,4 +1,4 @@
-package org.eclipselabs.mscript.computation.engine;
+package org.eclipselabs.mscript.computation.core;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/IComputationContext.java

@@ -9,7 +9,7 @@
  *    Andreas Unger - initial API and implementation 
  ****************************************************************************/
 
-package org.eclipselabs.mscript.computation.engine;
+package org.eclipselabs.mscript.computation.core;
 
 import org.eclipselabs.mscript.computation.computationmodel.ComputationModel;
 

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/IOverflowMonitor.java

@@ -9,7 +9,7 @@
  *    Andreas Unger - initial API and implementation 
  ****************************************************************************/
 
-package org.eclipselabs.mscript.computation.engine;
+package org.eclipselabs.mscript.computation.core;
 
 /**
  * @author Andreas Unger

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/NullOverflowMonitor.java

@@ -9,7 +9,7 @@
  *    Andreas Unger - initial API and implementation 
  ****************************************************************************/
 
-package org.eclipselabs.mscript.computation.engine;
+package org.eclipselabs.mscript.computation.core;
 
 /**
  * @author Andreas Unger
@@ -18,7 +18,7 @@ package org.eclipselabs.mscript.computation.engine;
 public class NullOverflowMonitor implements IOverflowMonitor {
 
 	/* (non-Javadoc)
-	 * @see org.eclipselabs.mscript.computation.engine.IOverflowMonitor#overflow(org.eclipselabs.mscript.computation.engine.OverflowEvent)
+	 * @see org.eclipselabs.mscript.computation.core.IOverflowMonitor#overflow(org.eclipselabs.mscript.computation.core.OverflowEvent)
 	 */
 	public void handleOverflow(OverflowInfo info) {
 	}

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/OverflowInfo.java

@@ -9,7 +9,7 @@
  *    Andreas Unger - initial API and implementation 
  ****************************************************************************/
 
-package org.eclipselabs.mscript.computation.engine;
+package org.eclipselabs.mscript.computation.core;
 
 
 /**

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/OverflowMonitor.java

@@ -9,7 +9,7 @@
  *    Andreas Unger - initial API and implementation 
  ****************************************************************************/
 
-package org.eclipselabs.mscript.computation.engine;
+package org.eclipselabs.mscript.computation.core;
 
 /**
  * @author Andreas Unger
@@ -20,7 +20,7 @@ public class OverflowMonitor implements IOverflowMonitor {
 	private boolean overflowed;
 
 	/* (non-Javadoc)
-	 * @see org.eclipselabs.mscript.computation.engine.IOverflowMonitor#overflow(org.eclipselabs.mscript.computation.engine.OverflowEvent)
+	 * @see org.eclipselabs.mscript.computation.core.IOverflowMonitor#overflow(org.eclipselabs.mscript.computation.core.OverflowEvent)
 	 */
 	public void handleOverflow(OverflowInfo info) {
 		overflowed = true;

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/value/AbstractExplicitDataTypeValue.java

@@ -9,9 +9,9 @@
  *    Andreas Unger - initial API and implementation 
  ****************************************************************************/
 
-package org.eclipselabs.mscript.computation.engine.value;
+package org.eclipselabs.mscript.computation.core.value;
 
-import org.eclipselabs.mscript.computation.engine.IComputationContext;
+import org.eclipselabs.mscript.computation.core.IComputationContext;
 import org.eclipselabs.mscript.typesystem.DataType;
 
 

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/value/AbstractNumericValue.java

@@ -9,11 +9,11 @@
  *    Andreas Unger - initial API and implementation 
  ****************************************************************************/
 
-package org.eclipselabs.mscript.computation.engine.value;
+package org.eclipselabs.mscript.computation.core.value;
 
 import org.eclipselabs.mscript.computation.computationmodel.NumberFormat;
 import org.eclipselabs.mscript.computation.computationmodel.util.ComputationModelUtil;
-import org.eclipselabs.mscript.computation.engine.IComputationContext;
+import org.eclipselabs.mscript.computation.core.IComputationContext;
 import org.eclipselabs.mscript.typesystem.DataType;
 import org.eclipselabs.mscript.typesystem.NumericType;
 import org.eclipselabs.mscript.typesystem.util.TypeSystemUtil;
@@ -32,7 +32,7 @@ public abstract class AbstractNumericValue extends AbstractExplicitDataTypeValue
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipselabs.mscript.computation.engine.value.AbstractExplicitDataTypeValue#getDataType()
+	 * @see org.eclipselabs.mscript.computation.core.value.AbstractExplicitDataTypeValue#getDataType()
 	 */
 	@Override
 	public NumericType getDataType() {

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/value/AbstractValue.java

@@ -9,12 +9,12 @@
  *    Andreas Unger - initial API and implementation 
  ****************************************************************************/
 
-package org.eclipselabs.mscript.computation.engine.value;
+package org.eclipselabs.mscript.computation.core.value;
 
 import java.util.List;
 
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipselabs.mscript.computation.engine.IComputationContext;
+import org.eclipselabs.mscript.computation.core.IComputationContext;
 import org.eclipselabs.mscript.typesystem.DataType;
 import org.eclipselabs.mscript.typesystem.InvalidDataType;
 import org.eclipselabs.mscript.typesystem.OperatorKind;

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/value/AbstractValueDecorator.java

@@ -9,7 +9,7 @@
  *    Andreas Unger - initial API and implementation 
  ****************************************************************************/
 
-package org.eclipselabs.mscript.computation.engine.value;
+package org.eclipselabs.mscript.computation.core.value;
 
 import java.util.List;
 

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/value/AnyValue.java

@@ -9,10 +9,10 @@
  *    Andreas Unger - initial API and implementation 
  ****************************************************************************/
 
-package org.eclipselabs.mscript.computation.engine.value;
+package org.eclipselabs.mscript.computation.core.value;
 
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipselabs.mscript.computation.engine.IComputationContext;
+import org.eclipselabs.mscript.computation.core.IComputationContext;
 import org.eclipselabs.mscript.typesystem.DataType;
 
 /**

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/value/ArrayValue.java

@@ -9,9 +9,9 @@
  *    Andreas Unger - initial API and implementation 
  ****************************************************************************/
 
-package org.eclipselabs.mscript.computation.engine.value;
+package org.eclipselabs.mscript.computation.core.value;
 
-import org.eclipselabs.mscript.computation.engine.IComputationContext;
+import org.eclipselabs.mscript.computation.core.IComputationContext;
 import org.eclipselabs.mscript.typesystem.ArrayType;
 import org.eclipselabs.mscript.typesystem.TensorType;
 

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/value/Binary64Value.java

@@ -9,7 +9,7 @@
  *    Andreas Unger - initial API and implementation 
  ****************************************************************************/
 
-package org.eclipselabs.mscript.computation.engine.value;
+package org.eclipselabs.mscript.computation.core.value;
 
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipselabs.mscript.computation.computationmodel.FixedPointFormat;
@@ -18,7 +18,7 @@ import org.eclipselabs.mscript.computation.computationmodel.FixedPointOperationK
 import org.eclipselabs.mscript.computation.computationmodel.FloatingPointFormat;
 import org.eclipselabs.mscript.computation.computationmodel.NumberFormat;
 import org.eclipselabs.mscript.computation.computationmodel.util.ComputationModelUtil;
-import org.eclipselabs.mscript.computation.engine.IComputationContext;
+import org.eclipselabs.mscript.computation.core.IComputationContext;
 import org.eclipselabs.mscript.typesystem.DataType;
 import org.eclipselabs.mscript.typesystem.IntegerType;
 import org.eclipselabs.mscript.typesystem.NumericType;
@@ -129,7 +129,7 @@ public class Binary64Value extends AbstractNumericValue implements ISimpleNumeri
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipselabs.mscript.computation.engine.value.ISimpleNumericValue#round()
+	 * @see org.eclipselabs.mscript.computation.core.value.ISimpleNumericValue#round()
 	 */
 	public IValue round() {
 		IntegerType resultDataType = TypeSystemFactory.eINSTANCE.createIntegerType();

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/value/BooleanValue.java

@@ -9,9 +9,9 @@
  *    Andreas Unger - initial API and implementation 
  ****************************************************************************/
 
-package org.eclipselabs.mscript.computation.engine.value;
+package org.eclipselabs.mscript.computation.core.value;
 
-import org.eclipselabs.mscript.computation.engine.IComputationContext;
+import org.eclipselabs.mscript.computation.core.IComputationContext;
 import org.eclipselabs.mscript.typesystem.DataType;
 import org.eclipselabs.mscript.typesystem.util.TypeSystemUtil;
 

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/value/FixedPointValue.java

@@ -9,7 +9,7 @@
  *    Andreas Unger - initial API and implementation 
  ****************************************************************************/
 
-package org.eclipselabs.mscript.computation.engine.value;
+package org.eclipselabs.mscript.computation.core.value;
 
 import java.math.BigInteger;
 
@@ -20,8 +20,8 @@ import org.eclipselabs.mscript.computation.computationmodel.FixedPointOperationK
 import org.eclipselabs.mscript.computation.computationmodel.FloatingPointFormat;
 import org.eclipselabs.mscript.computation.computationmodel.NumberFormat;
 import org.eclipselabs.mscript.computation.computationmodel.util.ComputationModelUtil;
-import org.eclipselabs.mscript.computation.engine.IComputationContext;
-import org.eclipselabs.mscript.computation.engine.OverflowInfo;
+import org.eclipselabs.mscript.computation.core.IComputationContext;
+import org.eclipselabs.mscript.computation.core.OverflowInfo;
 import org.eclipselabs.mscript.typesystem.DataType;
 import org.eclipselabs.mscript.typesystem.IntegerType;
 import org.eclipselabs.mscript.typesystem.NumericType;
@@ -193,7 +193,7 @@ public class FixedPointValue extends AbstractNumericValue implements ISimpleNume
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipselabs.mscript.computation.engine.value.ISimpleNumericValue#round()
+	 * @see org.eclipselabs.mscript.computation.core.value.ISimpleNumericValue#round()
 	 */
 	public IValue round() {
 		/*

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/value/IArrayValue.java

@@ -9,7 +9,7 @@
  *    Andreas Unger - initial API and implementation 
  ****************************************************************************/
 
-package org.eclipselabs.mscript.computation.engine.value;
+package org.eclipselabs.mscript.computation.core.value;
 
 /**
  * @author Andreas Unger

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/value/IBooleanValue.java

@@ -9,7 +9,7 @@
  *    Andreas Unger - initial API and implementation 
  ****************************************************************************/
 
-package org.eclipselabs.mscript.computation.engine.value;
+package org.eclipselabs.mscript.computation.core.value;
 
 /**
  * @author Andreas Unger

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/value/INumericValue.java

@@ -9,7 +9,7 @@
  *    Andreas Unger - initial API and implementation 
  ****************************************************************************/
 
-package org.eclipselabs.mscript.computation.engine.value;
+package org.eclipselabs.mscript.computation.core.value;
 
 import org.eclipselabs.mscript.typesystem.NumericType;
 

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/value/ISimpleNumericValue.java

@@ -9,7 +9,7 @@
  *    Andreas Unger - initial API and implementation 
  ****************************************************************************/
 
-package org.eclipselabs.mscript.computation.engine.value;
+package org.eclipselabs.mscript.computation.core.value;
 
 /**
  * @author Andreas Unger

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/value/IValue.java

@@ -9,7 +9,7 @@
  *    Andreas Unger - initial API and implementation 
  ****************************************************************************/
 
-package org.eclipselabs.mscript.computation.engine.value;
+package org.eclipselabs.mscript.computation.core.value;
 
 import java.util.List;
 

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/value/IValueConstructor.java

@@ -9,9 +9,9 @@
  *    Andreas Unger - initial API and implementation 
  ****************************************************************************/
 
-package org.eclipselabs.mscript.computation.engine.value;
+package org.eclipselabs.mscript.computation.core.value;
 
-import org.eclipselabs.mscript.computation.engine.IComputationContext;
+import org.eclipselabs.mscript.computation.core.IComputationContext;
 import org.eclipselabs.mscript.typesystem.NumericType;
 
 /**

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/value/InvalidValue.java

@@ -9,7 +9,7 @@
  *    Andreas Unger - initial API and implementation 
  ****************************************************************************/
 
-package org.eclipselabs.mscript.computation.engine.value;
+package org.eclipselabs.mscript.computation.core.value;
 
 import org.eclipselabs.mscript.typesystem.DataType;
 import org.eclipselabs.mscript.typesystem.util.TypeSystemUtil;

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/value/RecordValue.java

@@ -9,12 +9,12 @@
  *    Andreas Unger - initial API and implementation 
  ****************************************************************************/
 
-package org.eclipselabs.mscript.computation.engine.value;
+package org.eclipselabs.mscript.computation.core.value;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipselabs.mscript.computation.engine.IComputationContext;
+import org.eclipselabs.mscript.computation.core.IComputationContext;
 import org.eclipselabs.mscript.typesystem.DataType;
 import org.eclipselabs.mscript.typesystem.Record;
 

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/value/StringValue.java

@@ -9,9 +9,9 @@
  *    Andreas Unger - initial API and implementation 
  ****************************************************************************/
 
-package org.eclipselabs.mscript.computation.engine.value;
+package org.eclipselabs.mscript.computation.core.value;
 
-import org.eclipselabs.mscript.computation.engine.IComputationContext;
+import org.eclipselabs.mscript.computation.core.IComputationContext;
 import org.eclipselabs.mscript.typesystem.DataType;
 import org.eclipselabs.mscript.typesystem.util.TypeSystemUtil;
 

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/value/UninitializedValue.java

@@ -9,9 +9,9 @@
  *    Andreas Unger - initial API and implementation 
  ****************************************************************************/
 
-package org.eclipselabs.mscript.computation.engine.value;
+package org.eclipselabs.mscript.computation.core.value;
 
-import org.eclipselabs.mscript.computation.engine.IComputationContext;
+import org.eclipselabs.mscript.computation.core.IComputationContext;
 import org.eclipselabs.mscript.typesystem.DataType;
 
 

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/value/UnitValue.java

@@ -9,9 +9,9 @@
  *    Andreas Unger - initial API and implementation 
  ****************************************************************************/
 
-package org.eclipselabs.mscript.computation.engine.value;
+package org.eclipselabs.mscript.computation.core.value;
 
-import org.eclipselabs.mscript.computation.engine.IComputationContext;
+import org.eclipselabs.mscript.computation.core.IComputationContext;
 import org.eclipselabs.mscript.typesystem.DataType;
 import org.eclipselabs.mscript.typesystem.Unit;
 import org.eclipselabs.mscript.typesystem.util.TypeSystemUtil;

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/value/ValueConstructor.java

@@ -9,7 +9,7 @@
  *    Andreas Unger - initial API and implementation 
  ****************************************************************************/
 
-package org.eclipselabs.mscript.computation.engine.value;
+package org.eclipselabs.mscript.computation.core.value;
 
 import org.eclipselabs.mscript.computation.computationmodel.FixedPointFormat;
 import org.eclipselabs.mscript.computation.computationmodel.FixedPointOperation;
@@ -17,7 +17,7 @@ import org.eclipselabs.mscript.computation.computationmodel.FixedPointOperationK
 import org.eclipselabs.mscript.computation.computationmodel.FloatingPointFormat;
 import org.eclipselabs.mscript.computation.computationmodel.NumberFormat;
 import org.eclipselabs.mscript.computation.computationmodel.util.ComputationModelUtil;
-import org.eclipselabs.mscript.computation.engine.IComputationContext;
+import org.eclipselabs.mscript.computation.core.IComputationContext;
 import org.eclipselabs.mscript.typesystem.IntegerType;
 import org.eclipselabs.mscript.typesystem.NumericType;
 import org.eclipselabs.mscript.typesystem.RealType;

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/value/ValueTransformer.java

@@ -9,9 +9,9 @@
  *    Andreas Unger - initial API and implementation 
  ****************************************************************************/
 
-package org.eclipselabs.mscript.computation.engine.value;
+package org.eclipselabs.mscript.computation.core.value;
 
-import org.eclipselabs.mscript.computation.engine.IComputationContext;
+import org.eclipselabs.mscript.computation.core.IComputationContext;
 import org.eclipselabs.mscript.typesystem.IntegerType;
 import org.eclipselabs.mscript.typesystem.RealType;
 

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.engine/src/org/eclipselabs/mscript/computation/engine/value/VectorValue.java

@@ -9,9 +9,9 @@
  *    Andreas Unger - initial API and implementation 
  ****************************************************************************/
 
-package org.eclipselabs.mscript.computation.engine.value;
+package org.eclipselabs.mscript.computation.core.value;
 
-import org.eclipselabs.mscript.computation.engine.IComputationContext;
+import org.eclipselabs.mscript.computation.core.IComputationContext;
 import org.eclipselabs.mscript.typesystem.DataType;
 import org.eclipselabs.mscript.typesystem.TensorType;
 
@@ -39,7 +39,7 @@ public class VectorValue extends AbstractExplicitDataTypeValue implements IArray
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipselabs.mscript.computation.engine.value.AbstractExplicitDataTypeValue#getDataType()
+	 * @see org.eclipselabs.mscript.computation.core.value.AbstractExplicitDataTypeValue#getDataType()
 	 */
 	@Override
 	public TensorType getDataType() {
@@ -47,7 +47,7 @@ public class VectorValue extends AbstractExplicitDataTypeValue implements IArray
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipselabs.mscript.computation.engine.value.AbstractValue#doConvert(org.eclipselabs.mscript.typesystem.DataType)
+	 * @see org.eclipselabs.mscript.computation.core.value.AbstractValue#doConvert(org.eclipselabs.mscript.typesystem.DataType)
 	 */
 	@Override
 	protected IValue doConvert(DataType dataType) {
@@ -81,7 +81,7 @@ public class VectorValue extends AbstractExplicitDataTypeValue implements IArray
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipselabs.mscript.computation.engine.value.IArrayValue#set(int[], org.eclipselabs.mscript.computation.engine.value.IValue)
+	 * @see org.eclipselabs.mscript.computation.core.value.IArrayValue#set(int[], org.eclipselabs.mscript.computation.core.value.IValue)
 	 */
 	public void set(int[] indices, IValue value) {
 		if (indices.length != 1) {
@@ -94,7 +94,7 @@ public class VectorValue extends AbstractExplicitDataTypeValue implements IArray
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipselabs.mscript.computation.engine.value.AbstractValue#doMultiply(org.eclipselabs.mscript.computation.engine.value.IValue, org.eclipselabs.mscript.typesystem.DataType)
+	 * @see org.eclipselabs.mscript.computation.core.value.AbstractValue#doMultiply(org.eclipselabs.mscript.computation.core.value.IValue, org.eclipselabs.mscript.typesystem.DataType)
 	 */
 	@Override
 	protected IValue doMultiply(IValue other, DataType resultDataType) {

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.ide.core/META-INF/MANIFEST.MF

@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.xtext;bundle-version="1.0.0",
  org.eclipselabs.mscript.common;bundle-version="0.1.0",
  org.eclipselabs.mscript.language;bundle-version="0.1.0",
- org.eclipselabs.mscript.computation.engine;bundle-version="0.1.0",
+ org.eclipselabs.mscript.computation.core;bundle-version="0.1.0",
  org.eclipselabs.mscript.computation.computationmodel;bundle-version="0.1.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.ide.core/src/org/eclipselabs/mscript/ide/core/internal/launch/util/ParseUtil.java

@@ -16,7 +16,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.xtext.parser.IParseResult;
-import org.eclipselabs.mscript.computation.engine.value.IValue;
+import org.eclipselabs.mscript.computation.core.value.IValue;
 import org.eclipselabs.mscript.ide.core.IDECorePlugin;
 import org.eclipselabs.mscript.language.ast.Expression;
 import org.eclipselabs.mscript.language.ast.ExpressionList;

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.ide.core/src/org/eclipselabs/mscript/ide/core/launch/AbstractMscriptLaunchConfigurationDelegate.java

@@ -21,8 +21,8 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.xtext.parser.IParseResult;
 import org.eclipselabs.mscript.computation.computationmodel.ComputationModel;
 import org.eclipselabs.mscript.computation.computationmodel.util.ComputationModelUtil;
-import org.eclipselabs.mscript.computation.engine.ComputationContext;
-import org.eclipselabs.mscript.computation.engine.value.IValue;
+import org.eclipselabs.mscript.computation.core.ComputationContext;
+import org.eclipselabs.mscript.computation.core.value.IValue;
 import org.eclipselabs.mscript.ide.core.IDECorePlugin;
 import org.eclipselabs.mscript.ide.core.internal.launch.util.ParseUtil;
 import org.eclipselabs.mscript.language.ast.DataTypeSpecifier;

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.ide.core/src/org/eclipselabs/mscript/ide/core/launch/MscriptLaunchConfigurationDelegate.java

@@ -17,8 +17,8 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.xtext.util.StringInputStream;
-import org.eclipselabs.mscript.computation.engine.ComputationContext;
-import org.eclipselabs.mscript.computation.engine.value.IValue;
+import org.eclipselabs.mscript.computation.core.ComputationContext;
+import org.eclipselabs.mscript.computation.core.value.IValue;
 import org.eclipselabs.mscript.ide.core.IDECorePlugin;
 import org.eclipselabs.mscript.ide.core.internal.launch.util.ParseUtil;
 import org.eclipselabs.mscript.language.interpreter.FunctionObject;

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.ide.core/src/org/eclipselabs/mscript/ide/core/launch/MscriptThread.java

@@ -21,9 +21,9 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.xtext.util.StringInputStream;
-import org.eclipselabs.mscript.computation.engine.value.IBooleanValue;
-import org.eclipselabs.mscript.computation.engine.value.ISimpleNumericValue;
-import org.eclipselabs.mscript.computation.engine.value.IValue;
+import org.eclipselabs.mscript.computation.core.value.IBooleanValue;
+import org.eclipselabs.mscript.computation.core.value.ISimpleNumericValue;
+import org.eclipselabs.mscript.computation.core.value.IValue;
 import org.eclipselabs.mscript.ide.core.IDECorePlugin;
 import org.eclipselabs.mscript.ide.core.internal.launch.util.ParseUtil;
 import org.eclipselabs.mscript.language.interpreter.IFunctionObject;

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.language/META-INF/MANIFEST.MF

@@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.emf.common,
  org.antlr.runtime,
  org.eclipselabs.mscript.common;bundle-version="0.1.0",
- org.eclipselabs.mscript.computation.engine;bundle-version="0.1.0"
+ org.eclipselabs.mscript.computation.core;bundle-version="0.1.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipselabs.mscript.language,
  org.eclipselabs.mscript.language.ast,

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.language/model/IL.ecore

@@ -111,5 +111,5 @@
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" changeable="false"
         volatile="true" transient="true" derived="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="IValue" instanceClassName="org.eclipselabs.mscript.computation.engine.value.IValue"/>
+  <eClassifiers xsi:type="ecore:EDataType" name="IValue" instanceClassName="org.eclipselabs.mscript.computation.core.value.IValue"/>
 </ecore:EPackage>

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.language/src/org/eclipselabs/mscript/language/il/ILPackage.java

@@ -1014,7 +1014,7 @@ public interface ILPackage extends EPackage {
 	 * The meta object id for the '<em>IValue</em>' data type.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipselabs.mscript.computation.engine.value.IValue
+	 * @see org.eclipselabs.mscript.computation.core.value.IValue
 	 * @see org.eclipselabs.mscript.language.il.impl.ILPackageImpl#getIValue()
 	 * @generated
 	 */
@@ -1626,12 +1626,12 @@ public interface ILPackage extends EPackage {
 	EAttribute getName_LastSegment();
 
 	/**
-	 * Returns the meta object for data type '{@link org.eclipselabs.mscript.computation.engine.value.IValue <em>IValue</em>}'.
+	 * Returns the meta object for data type '{@link org.eclipselabs.mscript.computation.core.value.IValue <em>IValue</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for data type '<em>IValue</em>'.
-	 * @see org.eclipselabs.mscript.computation.engine.value.IValue
-	 * @model instanceClass="org.eclipselabs.mscript.computation.engine.value.IValue"
+	 * @see org.eclipselabs.mscript.computation.core.value.IValue
+	 * @model instanceClass="org.eclipselabs.mscript.computation.core.value.IValue"
 	 * @generated
 	 */
 	EDataType getIValue();
@@ -2162,7 +2162,7 @@ public interface ILPackage extends EPackage {
 		 * The meta object literal for the '<em>IValue</em>' data type.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipselabs.mscript.computation.engine.value.IValue
+		 * @see org.eclipselabs.mscript.computation.core.value.IValue
 		 * @see org.eclipselabs.mscript.language.il.impl.ILPackageImpl#getIValue()
 		 * @generated
 		 */

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.language/src/org/eclipselabs/mscript/language/il/TemplateVariableDeclaration.java

@@ -6,7 +6,7 @@
  */
 package org.eclipselabs.mscript.language.il;
 
-import org.eclipselabs.mscript.computation.engine.value.IValue;
+import org.eclipselabs.mscript.computation.core.value.IValue;
 
 
 /**

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.language/src/org/eclipselabs/mscript/language/il/impl/ILFactoryImpl.java

@@ -12,7 +12,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipselabs.mscript.computation.engine.value.IValue;
+import org.eclipselabs.mscript.computation.core.value.IValue;
 import org.eclipselabs.mscript.language.il.Assignment;
 import org.eclipselabs.mscript.language.il.Compound;
 import org.eclipselabs.mscript.language.il.CompoundStatement;

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.language/src/org/eclipselabs/mscript/language/il/impl/ILPackageImpl.java

@@ -12,7 +12,7 @@ import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipselabs.mscript.computation.engine.value.IValue;
+import org.eclipselabs.mscript.computation.core.value.IValue;
 import org.eclipselabs.mscript.language.ast.AstPackage;
 import org.eclipselabs.mscript.language.il.Assignment;
 import org.eclipselabs.mscript.language.il.Compound;

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.language/src/org/eclipselabs/mscript/language/il/impl/TemplateVariableDeclarationImpl.java

@@ -9,7 +9,7 @@ package org.eclipselabs.mscript.language.il.impl;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipselabs.mscript.computation.engine.value.IValue;
+import org.eclipselabs.mscript.computation.core.value.IValue;
 import org.eclipselabs.mscript.language.il.ILPackage;
 import org.eclipselabs.mscript.language.il.TemplateVariableDeclaration;
 

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.language/src/org/eclipselabs/mscript/language/il/transform/FunctionDefinitionTransformer.java

@@ -24,7 +24,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.MultiStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipselabs.mscript.computation.engine.value.IValue;
+import org.eclipselabs.mscript.computation.core.value.IValue;
 import org.eclipselabs.mscript.language.ast.ParameterDeclaration;
 import org.eclipselabs.mscript.language.ast.StateVariableDeclaration;
 import org.eclipselabs.mscript.language.functionmodel.EquationDescriptor;

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.language/src/org/eclipselabs/mscript/language/il/transform/IFunctionDefinitionTransformer.java

@@ -13,7 +13,7 @@ package org.eclipselabs.mscript.language.il.transform;
 
 import java.util.List;
 
-import org.eclipselabs.mscript.computation.engine.value.IValue;
+import org.eclipselabs.mscript.computation.core.value.IValue;
 import org.eclipselabs.mscript.language.functionmodel.FunctionDescriptor;
 import org.eclipselabs.mscript.typesystem.DataType;
 

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.language/src/org/eclipselabs/mscript/language/internal/il/transform/AssertionEvaluator.java

@@ -15,9 +15,9 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.MultiStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipselabs.mscript.computation.engine.ComputationContext;
-import org.eclipselabs.mscript.computation.engine.value.IBooleanValue;
-import org.eclipselabs.mscript.computation.engine.value.IValue;
+import org.eclipselabs.mscript.computation.core.ComputationContext;
+import org.eclipselabs.mscript.computation.core.value.IBooleanValue;
+import org.eclipselabs.mscript.computation.core.value.IValue;
 import org.eclipselabs.mscript.language.ast.Assertion;
 import org.eclipselabs.mscript.language.ast.Expression;
 import org.eclipselabs.mscript.language.ast.StringLiteral;

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.language/src/org/eclipselabs/mscript/language/interpreter/CompoundInterpreter.java

@@ -11,10 +11,10 @@
 
 package org.eclipselabs.mscript.language.interpreter;
 
-import org.eclipselabs.mscript.computation.engine.value.IArrayValue;
-import org.eclipselabs.mscript.computation.engine.value.IBooleanValue;
-import org.eclipselabs.mscript.computation.engine.value.IValue;
-import org.eclipselabs.mscript.computation.engine.value.UninitializedValue;
+import org.eclipselabs.mscript.computation.core.value.IArrayValue;
+import org.eclipselabs.mscript.computation.core.value.IBooleanValue;
+import org.eclipselabs.mscript.computation.core.value.IValue;
+import org.eclipselabs.mscript.computation.core.value.UninitializedValue;
 import org.eclipselabs.mscript.language.il.Assignment;
 import org.eclipselabs.mscript.language.il.Compound;
 import org.eclipselabs.mscript.language.il.ForeachStatement;

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.language/src/org/eclipselabs/mscript/language/interpreter/ExpressionValueEvaluator.java

@@ -16,16 +16,16 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipselabs.mscript.computation.engine.value.ArrayValue;
-import org.eclipselabs.mscript.computation.engine.value.IBooleanValue;
-import org.eclipselabs.mscript.computation.engine.value.INumericValue;
-import org.eclipselabs.mscript.computation.engine.value.IValue;
-import org.eclipselabs.mscript.computation.engine.value.IValueConstructor;
-import org.eclipselabs.mscript.computation.engine.value.InvalidValue;
-import org.eclipselabs.mscript.computation.engine.value.StringValue;
-import org.eclipselabs.mscript.computation.engine.value.UnitValue;
-import org.eclipselabs.mscript.computation.engine.value.ValueConstructor;
-import org.eclipselabs.mscript.computation.engine.value.VectorValue;
+import org.eclipselabs.mscript.computation.core.value.ArrayValue;
+import org.eclipselabs.mscript.computation.core.value.IBooleanValue;
+import org.eclipselabs.mscript.computation.core.value.INumericValue;
+import org.eclipselabs.mscript.computation.core.value.IValue;
+import org.eclipselabs.mscript.computation.core.value.IValueConstructor;
+import org.eclipselabs.mscript.computation.core.value.InvalidValue;
+import org.eclipselabs.mscript.computation.core.value.StringValue;
+import org.eclipselabs.mscript.computation.core.value.UnitValue;
+import org.eclipselabs.mscript.computation.core.value.ValueConstructor;
+import org.eclipselabs.mscript.computation.core.value.VectorValue;
 import org.eclipselabs.mscript.language.ast.AdditiveExpression;
 import org.eclipselabs.mscript.language.ast.AdditiveExpressionPart;
 import org.eclipselabs.mscript.language.ast.AdditiveOperator;

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.language/src/org/eclipselabs/mscript/language/interpreter/FunctionObject.java

@@ -16,7 +16,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipselabs.mscript.computation.engine.value.ValueTransformer;
+import org.eclipselabs.mscript.computation.core.value.ValueTransformer;
 import org.eclipselabs.mscript.language.il.ILFunctionDefinition;
 import org.eclipselabs.mscript.language.il.InputVariableDeclaration;
 import org.eclipselabs.mscript.language.il.InstanceVariableDeclaration;

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.language/src/org/eclipselabs/mscript/language/interpreter/IExpressionValueEvaluator.java

@@ -11,7 +11,7 @@
 
 package org.eclipselabs.mscript.language.interpreter;
 
-import org.eclipselabs.mscript.computation.engine.value.IValue;
+import org.eclipselabs.mscript.computation.core.value.IValue;
 import org.eclipselabs.mscript.language.ast.Expression;
 
 /**

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.language/src/org/eclipselabs/mscript/language/interpreter/IInterpreter.java

@@ -13,7 +13,7 @@ package org.eclipselabs.mscript.language.interpreter;
 
 import java.util.List;
 
-import org.eclipselabs.mscript.computation.engine.value.IValue;
+import org.eclipselabs.mscript.computation.core.value.IValue;
 
 /**
  * @author Andreas Unger

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.language/src/org/eclipselabs/mscript/language/interpreter/IInterpreterContext.java

@@ -11,7 +11,7 @@
 
 package org.eclipselabs.mscript.language.interpreter;
 
-import org.eclipselabs.mscript.computation.engine.IComputationContext;
+import org.eclipselabs.mscript.computation.core.IComputationContext;
 import org.eclipselabs.mscript.language.il.VariableDeclaration;
 
 /**

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.language/src/org/eclipselabs/mscript/language/interpreter/IVariable.java

@@ -11,7 +11,7 @@
 
 package org.eclipselabs.mscript.language.interpreter;
 
-import org.eclipselabs.mscript.computation.engine.value.IValue;
+import org.eclipselabs.mscript.computation.core.value.IValue;
 import org.eclipselabs.mscript.language.il.VariableDeclaration;
 
 /**

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.language/src/org/eclipselabs/mscript/language/interpreter/Interpreter.java

@@ -15,7 +15,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.eclipselabs.mscript.computation.engine.value.IValue;
+import org.eclipselabs.mscript.computation.core.value.IValue;
 import org.eclipselabs.mscript.language.il.Compound;
 import org.eclipselabs.mscript.language.il.ComputationCompound;
 import org.eclipselabs.mscript.language.il.InputVariableDeclaration;

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.language/src/org/eclipselabs/mscript/language/interpreter/InterpreterContext.java

@@ -12,7 +12,7 @@
 package org.eclipselabs.mscript.language.interpreter;
 
 import org.eclipselabs.mscript.common.internal.util.Scope;
-import org.eclipselabs.mscript.computation.engine.IComputationContext;
+import org.eclipselabs.mscript.computation.core.IComputationContext;
 import org.eclipselabs.mscript.language.il.VariableDeclaration;
 
 /**

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.language/src/org/eclipselabs/mscript/language/interpreter/StaticInterpreterContext.java

@@ -14,9 +14,9 @@ package org.eclipselabs.mscript.language.interpreter;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipselabs.mscript.computation.engine.IComputationContext;
-import org.eclipselabs.mscript.computation.engine.value.AnyValue;
-import org.eclipselabs.mscript.computation.engine.value.IValue;
+import org.eclipselabs.mscript.computation.core.IComputationContext;
+import org.eclipselabs.mscript.computation.core.value.AnyValue;
+import org.eclipselabs.mscript.computation.core.value.IValue;
 import org.eclipselabs.mscript.language.il.ILFunctionDefinition;
 import org.eclipselabs.mscript.language.il.InputVariableDeclaration;
 import org.eclipselabs.mscript.language.il.TemplateVariableDeclaration;

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.language/src/org/eclipselabs/mscript/language/interpreter/Variable.java

@@ -13,7 +13,7 @@ package org.eclipselabs.mscript.language.interpreter;
 
 import java.util.ArrayList;
 
-import org.eclipselabs.mscript.computation.engine.value.IValue;
+import org.eclipselabs.mscript.computation.core.value.IValue;
 import org.eclipselabs.mscript.language.il.VariableDeclaration;
 
 /**

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.language/src/org/eclipselabs/mscript/language/interpreter/builtin/IFunction.java

@@ -13,7 +13,7 @@ package org.eclipselabs.mscript.language.interpreter.builtin;
 
 import java.util.List;
 
-import org.eclipselabs.mscript.computation.engine.value.IValue;
+import org.eclipselabs.mscript.computation.core.value.IValue;
 import org.eclipselabs.mscript.language.interpreter.IInterpreterContext;
 
 /**

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.language/src/org/eclipselabs/mscript/language/interpreter/builtin/RoundFunction.java

@@ -14,8 +14,8 @@ package org.eclipselabs.mscript.language.interpreter.builtin;
 import java.util.Collections;
 import java.util.List;
 
-import org.eclipselabs.mscript.computation.engine.value.ISimpleNumericValue;
-import org.eclipselabs.mscript.computation.engine.value.IValue;
+import org.eclipselabs.mscript.computation.core.value.ISimpleNumericValue;
+import org.eclipselabs.mscript.computation.core.value.IValue;
 import org.eclipselabs.mscript.language.interpreter.IInterpreterContext;
 
 /**

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.language/src/org/eclipselabs/mscript/language/interpreter/builtin/SumFunction.java

@@ -14,8 +14,8 @@ package org.eclipselabs.mscript.language.interpreter.builtin;
 import java.util.Collections;
 import java.util.List;
 
-import org.eclipselabs.mscript.computation.engine.value.IValue;
-import org.eclipselabs.mscript.computation.engine.value.VectorValue;
+import org.eclipselabs.mscript.computation.core.value.IValue;
+import org.eclipselabs.mscript.computation.core.value.VectorValue;
 import org.eclipselabs.mscript.language.interpreter.IInterpreterContext;
 
 /**

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.language/src/org/eclipselabs/mscript/language/interpreter/builtin/UnitFunction.java

@@ -15,8 +15,8 @@ import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipselabs.mscript.computation.engine.value.IValue;
-import org.eclipselabs.mscript.computation.engine.value.UnitValue;
+import org.eclipselabs.mscript.computation.core.value.IValue;
+import org.eclipselabs.mscript.computation.core.value.UnitValue;
 import org.eclipselabs.mscript.language.interpreter.IInterpreterContext;
 import org.eclipselabs.mscript.typesystem.NumericType;
 

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.language/src/org/eclipselabs/mscript/language/interpreter/util/ExpressionInterpreterHelper.java

@@ -16,7 +16,7 @@ import java.util.Collections;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.MultiStatus;
-import org.eclipselabs.mscript.computation.engine.value.IValue;
+import org.eclipselabs.mscript.computation.core.value.IValue;
 import org.eclipselabs.mscript.language.ast.Expression;
 import org.eclipselabs.mscript.language.il.Compound;
 import org.eclipselabs.mscript.language.il.ILFactory;

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.language/src/org/eclipselabs/mscript/language/validation/MscriptJavaValidator.java

@@ -6,9 +6,9 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.validation.Check;
-import org.eclipselabs.mscript.computation.engine.ComputationContext;
-import org.eclipselabs.mscript.computation.engine.value.AnyValue;
-import org.eclipselabs.mscript.computation.engine.value.IValue;
+import org.eclipselabs.mscript.computation.core.ComputationContext;
+import org.eclipselabs.mscript.computation.core.value.AnyValue;
+import org.eclipselabs.mscript.computation.core.value.IValue;
 import org.eclipselabs.mscript.language.ast.ArrayElementAccess;
 import org.eclipselabs.mscript.language.ast.ArraySubscript;
 import org.eclipselabs.mscript.language.ast.AstPackage;