2 files changed, 52 insertions, 0 deletions

diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/conversion/ProblemValueConverterService.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/conversion/ProblemValueConverterService.java
new file mode 100644
index 00000000..4f5fd069
--- /dev/null
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/conversion/ProblemValueConverterService.java
@@ -0,0 +1,17 @@
+package org.eclipse.viatra.solver.language.conversion;
+
+import org.eclipse.xtext.common.services.DefaultTerminalConverters;
+import org.eclipse.xtext.conversion.IValueConverter;
+import org.eclipse.xtext.conversion.ValueConverter;
+
+import com.google.inject.Inject;
+
+public class ProblemValueConverterService extends DefaultTerminalConverters {
+        @Inject
+        private UpperBoundValueConverter upperBoundValueConverter;
+        
+        @ValueConverter(rule = "UpperBound")
+        public IValueConverter<Integer> UpperBound() {
+                return upperBoundValueConverter;
+        }
+}
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/conversion/UpperBoundValueConverter.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/conversion/UpperBoundValueConverter.java
new file mode 100644
index 00000000..3111b69b
--- /dev/null
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/conversion/UpperBoundValueConverter.java
@@ -0,0 +1,35 @@
+package org.eclipse.viatra.solver.language.conversion;
+
+import org.eclipse.xtext.conversion.ValueConverterException;
+import org.eclipse.xtext.conversion.impl.AbstractValueConverter;
+import org.eclipse.xtext.conversion.impl.INTValueConverter;
+import org.eclipse.xtext.nodemodel.INode;
+
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+
+@Singleton
+public class UpperBoundValueConverter extends AbstractValueConverter<Integer> {
+        public static final String INFINITY = "*";      
+        
+        @Inject
+        private INTValueConverter intValueConverter;
+        
+        @Override
+        public Integer toValue(String string, INode node) throws ValueConverterException {
+                if (INFINITY.equals(string)) {
+                        return -1;
+                } else {
+                        return intValueConverter.toValue(string, node);
+                }
+        }
+
+        @Override
+        public String toString(Integer value) throws ValueConverterException {
+                if (value < 0) {
+                        return INFINITY;
+                } else {
+                        return intValueConverter.toString(value);
+                }
+        }
+}