remove old code

MODLanguage · Mar 18, 2019 · dfbab5f · dfbab5f
1 parent 9d3f511
commit dfbab5f
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 64 deletions.
diff --git a/src/main/java/uk/modl/interpreter/Interpreter.java b/src/main/java/uk/modl/interpreter/Interpreter.java
@@ -329,55 +329,6 @@ private void addValueFromPair(ModlObject modlObject, ModlObject.Pair rawPair, Ob
         }
     }
 
-//    private ModlValue runDeepReference(ModlObject.Pair value, ModlValue newValue) {
-//        if (value.getModlValue() != null) {
-//            ModlObject.Array array = ((ModlObject.Array) (value.getModlValue()));
-//            while (array.getValues().size() > 1 || array.getValues().get(0) instanceof ModlObject.Pair) {
-//                // Go down a level.
-//                // The first value is a number/string, so to load newValue from Map or Array in newValue
-//                // The second value is the next array in the loop - if there is one
-//                ModlValue referenceValue = array.get(0);
-//                if (array.getValues().get(0) instanceof ModlObject.Pair) {
-//                    referenceValue = ((ModlObject.Pair) array.getValues().get(0)).getKey();
-//                }
-//                newValue = referenceObject(newValue, referenceValue);
-//                if (array.getValues().size() > 1) {
-//                    array = ((ModlObject.Array) array.getValues().get(1));
-//                } else {
-//                    array = ((ModlObject.Array) ((ModlObject.Pair) array.getValues().get(0)).getModlValue());
-//                }
-//            }
-//            // We're down to the bottom now, so get the last number/string and load from the Map or Array in newValue
-//            newValue = referenceObject(newValue, array.get(0));
-//        }
-//        return newValue;
-//    }
-//
-//    private ModlValue referenceObject(ModlValue objectToReference, ModlValue referenceValue) {
-//        if (objectToReference instanceof ModlObject.Pair) {
-//            objectToReference = ((ModlObject.Pair) objectToReference).getModlValue();
-//        }
-//        if (objectToReference instanceof ModlObject.Map) {
-//            if (referenceValue instanceof ModlObject.String) {
-//                referenceValue = transformString(((ModlObject.String) referenceValue).string);
-//                return (((ModlObject.Map) objectToReference).get(((ModlObject.String) referenceValue)));
-//            }
-//            if (referenceValue instanceof ModlObject.Number) {
-//                return ((((ModlObject.Map) objectToReference).get(new Integer(((ModlObject.Number) referenceValue).number)))).getModlValue();
-//            }
-//        } else if (objectToReference instanceof ModlObject.Array) {
-//            if (referenceValue instanceof ModlObject.String) {
-//                referenceValue = transformString(((ModlObject.String) referenceValue).string);
-//                return (((ModlObject.Array) objectToReference).get(((ModlObject.String) referenceValue)));
-//            }
-//            if (referenceValue instanceof ModlObject.Number) {
-//                return (((ModlObject.Array) objectToReference).get(new Integer(((ModlObject.Number) referenceValue).number)));
-//            }
-//        }
-////        throw new RuntimeException("Can't reference " + objectToReference.getClass());
-//        return objectToReference;
-//    }
-
     private boolean generateModlClassObject(ModlObject modlObject, RawModlObject.Pair rawPair, ModlObject.Pair pair,
                                             String originalKey, String newKey, Object parentPair) {
         pair.setKey(modlObject.new String(newKey));

diff --git a/src/main/java/uk/modl/interpreter/StringTransformer.java b/src/main/java/uk/modl/interpreter/StringTransformer.java
@@ -456,7 +456,6 @@ private ModlValue getValueForReferenceRecursive(ModlValue ctx, final String key)
         }
 
         if (ctx instanceof ModlObject.String) {
-//            ModlValue temp  = getValueForReference(((ModlObject.String)ctx).string);
             ModlValue temp  = transformString(((ModlObject.String)ctx).string);
             if (temp != null) {
                 ctx = temp;
@@ -470,14 +469,7 @@ private ModlValue getValueForReferenceRecursive(ModlValue ctx, final String key)
                 throw new RuntimeException("Object reference is numerical for non-Array value");
             }
             int index = Integer.parseInt(currentKey);
-//            if (ctx instanceof ModlObject.Pair) {
-//                if (index != 0) {
-//                    throw new RuntimeException("Index should always be zero when reference the value of a Pair");
-//                }
-//                newCtx = ((ModlObject.Pair) ctx).getModlValue();
-//            } else {
                 newCtx = ctx.get(index);
-//            }
         } else {
             currentKey = ((ModlObject.String)(transformString(currentKey))).string;
             if (ctx instanceof ModlObject.Pair) {

diff --git a/src/main/java/uk/modl/parser/ModlParsed.java b/src/main/java/uk/modl/parser/ModlParsed.java
@@ -843,13 +843,6 @@ public void enterModl_value_conditional(MODLParser.Modl_value_conditionalContext
                             .enterRule(conditionalReturn);
                     valueConditionalReturns.put(conditionTest, conditionalReturn);
                 } else {
-//                    List<ValueItem> valueItems = new LinkedList<>();
-//                    Value value = new Value();
-//                    value.falseVal = new False();
-//                    ValueItem valueItem = new ValueItem();
-//                    valueItem.value = (value);
-//                    valueItems.add(valueItem);
-//                    conditionalReturn.valueItems =valueItems;
                     valueConditionalReturns.put(conditionTest, null);
                 }
             }