Fixed issue with large numeric attribtue values; SMT conversion now also considers features from attributes

Author: SundermannC

src/main/java/de/vill/conversion/ConvertSMTLevel.java

@@ -3,6 +3,8 @@
 import com.google.common.collect.Sets;
 import de.vill.model.*;
 import de.vill.model.constraint.*;
+import de.vill.model.expression.AggregateFunctionExpression;
+import de.vill.model.expression.BinaryExpression;
 import de.vill.model.expression.Expression;
 import de.vill.model.expression.LiteralExpression;
 
@@ -68,9 +70,14 @@ private Set<Feature> getFeaturesInEquation(ExpressionConstraint equation) {
 
     private Set<Feature> getFeaturesInExpression(Expression expression) {
         Set<Feature> featuresInEquation = new HashSet<>();
-        if (expression instanceof LiteralExpression && ((LiteralExpression) expression).getContent() instanceof Feature) {
-            featuresInEquation.add((Feature) ((LiteralExpression) expression).getContent());
-        } else {
+        if (expression instanceof LiteralExpression) {
+            LiteralExpression literalExpression = (LiteralExpression) expression;
+            if (literalExpression.getContent() instanceof Feature) {
+                featuresInEquation.add((Feature) ((LiteralExpression) expression).getContent());
+            } else if (literalExpression.getContent() instanceof Attribute<?>) {
+                featuresInEquation.add(((Attribute<?>) literalExpression.getContent()).getFeature());
+            }
+        }  else {
             for (Expression subExpression : expression.getExpressionSubParts()) {
                 featuresInEquation.addAll(getFeaturesInExpression(subExpression));
             }

src/main/java/de/vill/main/UVLListener.java

@@ -267,7 +267,7 @@ public void exitValueAttribute(UVLJavaParser.ValueAttributeContext ctx) {
             Attribute<Boolean> attribute = new Attribute<>(attributeName, Boolean.parseBoolean(ctx.value().getText().replace("'", "")), feature);
             attributeStack.peek().put(attributeName, attribute);
         } else if (ctx.value().INTEGER() != null) {
-            Attribute<Integer> attribute = new Attribute<>(attributeName, Integer.parseInt(ctx.value().getText().replace("'", "")), feature);
+            Attribute<Long> attribute = new Attribute<>(attributeName, Long.parseLong(ctx.value().getText().replace("'", "")), feature);
             attributeStack.peek().put(attributeName, attribute);
         } else if (ctx.value().FLOAT() != null) {
             Attribute<Double> attribute = new Attribute<>(attributeName, Double.parseDouble(ctx.value().getText().replace("'", "")), feature);

src/main/java/de/vill/model/building/FeatureModelBuilder.java

@@ -3,6 +3,7 @@
 import de.vill.exception.ParseError;
 import de.vill.model.*;
 import de.vill.model.constraint.Constraint;
+import de.vill.model.constraint.LiteralConstraint;
 
 import java.util.List;
 import java.util.Map;
@@ -135,4 +136,22 @@ public Set<LanguageLevel> getLanguageLevels() {
         return fmInConstruction.getUsedLanguageLevels();
     }
 
+    public LiteralConstraint createFeatureLiteral(String name) {
+        if (fmInConstruction.getFeatureMap().containsKey(name)) {
+            return new LiteralConstraint(fmInConstruction.getFeatureMap().get(name));
+        } else {
+            System.err.println("Tried to reference " + name + " but feature with that name does not exist");
+            return null;
+        }
+    }
+
+    public GlobalAttribute createGlobalAttribute(String name) {
+        GlobalAttribute toCreate = new GlobalAttribute(name, fmInConstruction);
+        if (toCreate.getType() == null) {
+            System.err.println("Tried to reference " + name + " but attribute with that name does not exist");
+            return null;
+        }
+        return toCreate;
+    }
+
 }