add function range #47

i-net-software · Feb 3, 2019 · f180eac · f180eac
1 parent 2f303fe
commit f180eac
Show file tree

Hide file tree

Showing 3 changed files with 77 additions and 1 deletion.
diff --git a/src/com/inet/lib/less/FunctionExpression.java b/src/com/inet/lib/less/FunctionExpression.java
@@ -294,6 +294,9 @@ public void appendTo( CssFormatter formatter ) {
                         return;
                     }
                     break;
+                case "range":
+                    range( formatter ).appendTo( formatter );
+                    return;
             }
             if( type == UNKNOWN ) {
                 eval( formatter );
@@ -451,6 +454,9 @@ private void eval( CssFormatter formatter ) {
                 case "extract":
                     extract( formatter );
                     return;
+                case "range":
+                    type = LIST;
+                    return;
                 case "alpha":
                     type = NUMBER;
                     switch( get( 0 ).getDataType( formatter ) ) {
@@ -1028,9 +1034,11 @@ private double getDouble( int idx, double defaultValue, CssFormatter formatter )
      */
     @Override
     public Operation listValue( CssFormatter formatter ) {
-        switch( super.toString().toLowerCase() ) {
+        switch( super.toString() ) {
             case "extract":
                 return extract( formatter ).listValue( formatter );
+            case "range":
+                return range( formatter );
         }
         return super.listValue( formatter );
     }
@@ -1084,4 +1092,36 @@ private Expression extract( CssFormatter formatter ) {
         return ex;
 
     }
+
+    /**
+     * Function range. Generate a list spanning a range of values
+     * 
+     * @param formatter
+     *            current CSS output
+     * @return The operation representing a list of values
+     */
+    private Operation range( CssFormatter formatter ) {
+        type = LIST;
+        double start = get( 0 ).doubleValue( formatter );
+        double end;
+        if( parameters.size() >= 2 ) {
+            end = get( 1 ).doubleValue( formatter );
+        } else {
+            end = start;
+            start = 1;
+        }
+        double step;
+        if( parameters.size() >= 3 ) {
+            step = get( 2 ).doubleValue( formatter );
+        } else {
+            step = 1;
+        }
+        String unit = get( 0 ).unit( formatter );
+        Operation op = new Operation( this, ' ' );
+        while( start <= end ) {
+            op.addOperand( new ValueExpression( this, start + unit ) );
+            start += step;
+        }
+        return op;
+    }
 }
diff --git a/test/com/inet/lib/less/samples/less_org_doc/list/range.css b/test/com/inet/lib/less/samples/less_org_doc/list/range.css
@@ -0,0 +1,16 @@
+simple {
+  value: 1 2 3 4;
+  length: 4;
+}
+full {
+  value: 10px 20px 30px;
+  length: 3;
+}
+empty {
+  value: ;
+  length: 0;
+}
+floating {
+  value: 1.4 1.6 1.8 2 2.2 2.4 2.6 2.8 3 3.2;
+  length: 10;
+}
diff --git a/test/com/inet/lib/less/samples/less_org_doc/list/range.less b/test/com/inet/lib/less/samples/less_org_doc/list/range.less
@@ -0,0 +1,20 @@
+simple {
+    @list: range(4);
+    value: @list;
+    length: length( @list );
+}
+full {
+    @list: range(10px, 30px, 10);
+    value: @list;
+    length: length( @list );
+}
+empty {
+    @list: range(10, 5);
+    value: @list;
+    length: length( @list );
+}
+floating {
+    @list: range(1.4, 3.4, 0.2);
+    value: @list;
+    length: length( @list );
+}