Changeset 184:0cd2857001e1 in livinglogic.java.ul4

Timestamp:

12/28/08 22:17:58 (11 years ago)

Author:

Walter Doerwald <walter@…>

Branch:

default

Message:

Add support for calling witha() as an UL4 method.

Location:

library/src/com/livinglogic/ul4

Files:

• Main.java (modified) (1 diff)
• Opcode.java (modified) (2 diffs)
• Template.java (modified) (2 diffs)
• Utils.java (modified) (2 diffs)

library/src/com/livinglogic/ul4/Main.java

@@ -11 +11 @@
         Color c = new Color(0x00, 0x63, 0xa8, 0x33);
         Color b = new Color(0x00, 0x00, 0x00, 0xff);
-        Template tmpl = Compiler.compile("<?print #fc9.withlum(0.2)?>");
+        Template tmpl = Compiler.compile("<?print repr(#fc9.witha(0x32))?>");
         System.out.println(tmpl);
         long start = System.currentTimeMillis();

library/src/com/livinglogic/ul4/Opcode.java

@@ -141 +141 @@
     public static final int CM1_GET = 10;
     public static final int CM1_WITHLUM = 11;
+    public static final int CM1_WITHA = 12;
 
     public static final int CM2_SPLIT = 0;
@@ -467 +468 @@
         else if (name.equals("withlum"))
             return CM1_WITHLUM;
+        else if (name.equals("witha"))
+            return CM1_WITHA;
         else
             throw new UnknownMethodException(name);

library/src/com/livinglogic/ul4/Template.java

@@ -1315 +1315 @@
                                     reg[code.r1] = Utils.withlum(reg[code.r2], reg[code.r3]);
                                     break;
+                                case Opcode.CM1_WITHA:
+                                    reg[code.r1] = Utils.witha(reg[code.r2], reg[code.r3]);
+                                    break;
                             }
                             break;
@@ -2097 +2100 @@
                             code(buffer, indent, "reg" + opcode.r1 + " = reg" + opcode.r2 + ".withlum(reg" + opcode.r3 + ")");
                             break;
+                        case Opcode.CM1_WITHA:
+                            code(buffer, indent, "reg" + opcode.r1 + " = reg" + opcode.r2 + ".witha(reg" + opcode.r3 + ")");
+                            break;
                     }
                     break;

library/src/com/livinglogic/ul4/Utils.java

@@ -1337 +1337 @@
     }
 
+    private static int _getint(Object arg)
+    {
+        if (arg instanceof Integer)
+            return ((Integer)arg).intValue();
+        else if (arg instanceof Double)
+            return ((Double)arg).intValue();
+        else
+            throw new UnsupportedOperationException("can't convert " + arg.getClass() + " to int!");
+    }
+
     public static Color rgb(Object arg1, Object arg2, Object arg3)
     {
@@ -1370 +1380 @@
     {
         return ((Color)arg1).withlum(_getdouble(arg2));
+    }
+
+    public static Color witha(Object arg1, Object arg2)
+    {
+        return ((Color)arg1).witha(_getint(arg2));
     }