Fixed conversion of SomeClass['staticFieldName']. closes HaxeFoundation#234 (HaxeFoundation#272)

Author: SlavaRa

.gitignore

@@ -1,4 +1,5 @@
 bin/
 build/
 report/
-run.n
+run.n
+*.hxproj

.travis.yml

@@ -3,7 +3,7 @@ language: haxe
 haxe:
   - development
   - 3.4.2
-  - 3.4.3
+  - 3.4.4
 
 os:
   - linux

CHANGES.md

@@ -1,4 +1,5 @@
 ## dev
+ - Fixed Conversion of `SomeClass['staticFieldName']` (fixes issue #234)
  - Replace `navigateToURL` with `flash.Lib.getURL` (fixes issue #257)
 
 ## 2017-09-13(1.0.5)

src/as3hx/Writer.hx

@@ -950,6 +950,75 @@ class Writer
         writeExpr(e);
     }
 
+    function writeEArray(e:Expr, index:Expr) {
+        //write("/* EArray ("+Std.string(e)+","+Std.string(index)+") " + Std.string(getExprType(e, true)) + "  */ ");
+        var old = inArrayAccess;
+        inArrayAccess = true;
+        // this test can be generalized to any array[]->get() translation
+        var etype = getExprType(e);
+        var itype = getExprType(index);
+        if(etype == "FastXML" || etype == "FastXMLList") {
+            writeExpr(e);
+            inArrayAccess = old;
+            write(".get(");
+            writeExpr(index);
+            write(")");
+        } else if(isMapType(etype)) {
+            writeExpr(e);
+            inArrayAccess = old;
+            var oldInLVA = inLvalAssign;
+            inLvalAssign = false;
+            if (oldInLVA) {
+                write(".set(");
+            } else {
+                write(".get(");
+            }
+            writeExpr(index);
+            if (oldInLVA) {
+                write(", ");
+                writeExpr(rvalue);
+                rvalue = null;
+            }
+            inLvalAssign = oldInLVA;
+            write(")");
+        } else {
+            //write("/*!!!" + etype + "!!!*/");
+            if(isDynamicType(etype) || ((isArrayType(etype) || e.match(EIdent(_))) && itype != null && itype != "Int" && itype != "UInt")) {
+                if(cfg.debugInferredType) {
+                    write("/* etype: " + etype + " itype: " + itype + " */");
+                }
+                var isString = (itype == "String");
+                var oldInLVA = inLvalAssign;
+                inLvalAssign = false;
+                if(oldInLVA)
+                    write("Reflect.setField(");
+                else
+                    write("Reflect.field(");
+                writeExpr(e);
+                inArrayAccess = old;
+                write(", ");
+                if(!isString)
+                    write("Std.string(");
+                writeExpr(index);
+                if(!isString)
+                    write(")");
+                if(oldInLVA) {
+                    write(", ");
+                    writeExpr(rvalue);
+                    rvalue = null;
+                }
+                inLvalAssign = oldInLVA;
+                write(")");
+            } else {
+                writeExpr(e);
+                inArrayAccess = old;
+                write("[");
+                writeExpr(index); 
+                write("]");
+            }
+        }
+    }
+    
     function writeLoop(incrs:Array<Expr>, f:Void->Void) {
         var old = loopIncrements;
         loopIncrements = incrs.slice(0);
@@ -1122,73 +1191,7 @@ class Writer
             case EContinue: rv = writeEContinue();
             case EFunction(f, name): writeFunction(f, false, false, false, name);
             case EReturn(e): writeEReturn(e);
-            case EArray(e, index):
-                //write("/* EArray ("+Std.string(e)+","+Std.string(index)+") " + Std.string(getExprType(e, true)) + "  */ ");
-                var old = inArrayAccess;
-                inArrayAccess = true;
-                // this test can be generalized to any array[]->get() translation
-                var etype = getExprType(e);
-                var itype = getExprType(index);
-                if(etype == "FastXML" || etype == "FastXMLList") {
-                    writeExpr(e);
-                    inArrayAccess = old;
-                    write(".get(");
-                    writeExpr(index);
-                    write(")");
-                } else if (isMapType(etype)) {
-                    writeExpr(e);
-                    inArrayAccess = old;
-                    var oldInLVA = inLvalAssign;
-                    inLvalAssign = false;
-                    if (oldInLVA) {
-                        write(".set(");
-                    } else {
-                        write(".get(");
-                    }
-                    writeExpr(index);
-                    if (oldInLVA) {
-                        write(", ");
-                        writeExpr(rvalue);
-                        rvalue = null;
-                    }
-                    inLvalAssign = oldInLVA;
-                    write(")");
-                } else {
-                    //write("/*!!!" + etype + "!!!*/");
-                    if(isDynamicType(etype) || (isArrayType(etype) && itype != null && itype != "Int" && itype != "UInt")) {
-                        if (cfg.debugInferredType) {
-                            write("/* etype: " + etype + " itype: " + itype + " */");
-                        }
-                        var isString = (itype == "String");
-                        var oldInLVA = inLvalAssign;
-                        inLvalAssign = false;
-                        if(oldInLVA)
-                            write("Reflect.setField(");
-                        else
-                            write("Reflect.field(");
-                        writeExpr(e);
-                        inArrayAccess = old;
-                        write(", ");
-                        if(!isString)
-                            write("Std.string(");
-                        writeExpr(index);
-                        if(!isString)
-                            write(")");
-                        if(oldInLVA) {
-                            write(", ");
-                            writeExpr(rvalue);
-                            rvalue = null;
-                        }
-                        inLvalAssign = oldInLVA;
-                        write(")");
-                    } else {
-                        writeExpr(e);
-                        inArrayAccess = old;
-                        write("[");
-                        writeExpr(index); 
-                        write("]");
-                    }
-                }
+            case EArray(e, index): writeEArray(e, index);
             case EArrayDecl(e):
                 var enl = false;
                 write("[");
@@ -3043,7 +3046,7 @@ class Writer
      * Checks if 'e' represents a numerical constant value
      * @return true if so
      */
-    static inline function isNumericConst(e:Expr) : Bool return switch(e) {
+    static inline function isNumericConst(e:Expr):Bool return switch(e) {
         case EConst(c): c.match(CInt(_)) || c.match(CFloat(_));
         default: false;
     }

test/issues/Issue234.as

@@ -0,0 +1,8 @@
+package {
+    import flash.display3D.Context3D;
+    public class Issue234 {
+        public function Issue234() {
+            var supportsVideoTexture:Boolean = Context3D["supportsVideoTexture"];
+        }
+    }
+}

test/issues/Issue234.hx

@@ -0,0 +1,9 @@
+import flash.display3D.Context3D;
+
+class Issue234
+{
+    public function new()
+    {
+        var supportsVideoTexture : Bool = Reflect.field(Context3D, "supportsVideoTexture");
+    }
+}

test/unit/as3hx/AS3HXTest.hx

@@ -466,6 +466,11 @@ class AS3HXTest {
         generate("Issue257.as", "Issue257.hx");
     }
 
+    @Test("flash.display3D.Context3D['supportsVideoTexture'] -> Reflect.field(flash.display3D.Context3D, 'supportsVideoTexture')")
+    public function issue234() {
+        generate("Issue234.as", "Issue234.hx");
+    }
+    
     function generate(as3FileName:String, expectedHaxeFileName:String) {
         var issuesDirectory = FileSystem.absolutePath("test/issues");
         var generatedDirectoryPath = '$issuesDirectory/generated';