range

Author: rmolives

src/main/java/org/devore/module/CoreModule.java

@@ -747,7 +747,8 @@ else if (ast.size() > 2)
                 throw new DevoreCastException(args.get(1).type(), "number");
             if (args.size() > 2 && !(args.get(2) instanceof DNumber))
                 throw new DevoreCastException(args.get(2).type(), "number");
-            boolean isFloat = args.getFirst() instanceof DFloat || args.get(1) instanceof DFloat || args.get(2) instanceof DFloat;
+            boolean isFloat = args.getFirst() instanceof DFloat ||
+                    (args.size() > 1 && args.get(1) instanceof DFloat) || (args.size() > 2 && args.get(2) instanceof DFloat);
             BigDecimal start, end, step;
             if (args.size() > 1) {
                 start = ((DNumber) args.get(0)).toBigDecimal();
@@ -765,13 +766,13 @@ else if (ast.size() > 2)
                 for (BigDecimal current = start;
                      current.compareTo(end) <= 0;
                      current = current.add(step)) {
-                    list.add(isFloat ? DInt.valueOf(current) : DFloat.valueOf(current));
+                    list.add(!isFloat ? DInt.valueOf(current) : DFloat.valueOf(current));
                 }
             } else {
                 for (BigDecimal current = start;
                      current.compareTo(end) >= 0;
                      current = current.add(step)) {
-                    list.add(isFloat ? DInt.valueOf(current) : DFloat.valueOf(current));
+                    list.add(!isFloat ? DInt.valueOf(current) : DFloat.valueOf(current));
                 }
             }
             return DList.valueOf(list);