ranger-compiler 2.1.70 → 3.0.4

package/dist/lib/lib/ImmutableVector.rgr

@@ -0,0 +1,364 @@
+
+
+; immutable map type
+trait Map @params( K T S ) {
+    def elements@(weak):[K:T]    
+}
+
+
+trait Vector @params( T S ) {
+
+    def start:int 0
+    def cardinality 3
+    def end:int 0
+    def elements@(weak):[T]
+    def parent@(weak):S
+
+    ; inserting a new element inside the array
+    ; you can re-use the arrays but the index ranges will change
+
+    fn localCopy:S () {
+        def obj (new S)
+        obj.start = start
+        obj.end = end
+        obj.parent = this.parent
+        obj.cardinality = cardinality
+        obj.elements = elements
+        return obj
+    }
+
+    fn set:S (idx:int item:T) {
+
+        if( idx >= start ) {
+            def res (this.localCopy())
+            res.elements = (make _:[T] (res.cardinality) item)
+            for elements e@(lives):T i {
+                if ( (res.start + i) != idx ) {
+                    set res.elements i e
+                } {
+                    set res.elements i item
+                }
+            }
+            return res
+        }
+        def root (this.localCopy())
+        def res root
+
+        def p@(weak):S parent
+        while( (!null? p) && (idx < p.start) ) {
+            def newSlice@(lives) (p.localCopy())
+            res.parent = newSlice
+            res = newSlice
+            if(!null? p.parent) {
+                p = p.parent
+            }
+        }
+        def newSlice@(lives) (p.localCopy())
+        newSlice.elements = (make _:[T] (newSlice.cardinality) item)
+        for p.elements e@(lives):T i {
+            set newSlice.elements i e           
+        }
+        set newSlice.elements (idx - newSlice.start) item 
+        res.parent = newSlice
+        return root
+    }    
+
+    fn insert:S (idx:int item:T) {
+        if( idx >= start ) {
+            def res (this.localCopy())
+            def use_card cardinality
+            if( ( array_length res.elements) >= (use_card - 1) ) {
+                use_card = ( array_length res.elements) + 1
+            }
+            res.elements = (make _:[T] (use_card) item)
+            for elements e@(lives):T i {
+                if ( res.start + i < idx ) {
+                    set res.elements i e
+                } {
+                    if( idx == ( res.start + i )) {
+                        set res.elements i item
+                        set res.elements (i + 1) e
+                    } {
+                        set res.elements (i + 1) e
+                    }                
+                }
+            }
+            if( (idx - start) >= (array_length elements)) {
+                set res.elements (idx - start) item
+            }
+            res.start = start
+            res.end = end + 1
+            res.cardinality = use_card
+            return res
+        }
+        def root (this.localCopy())
+        def res root
+        res.start = start + 1
+        res.end = end + 1        
+        def p@(weak):S parent
+        while( (!null? p) && (idx < p.start) ) {
+            def newSlice@(lives) (p.localCopy())
+            newSlice.start = newSlice.start + 1
+            newSlice.end = newSlice.end + 1
+            res.parent = newSlice
+            res = newSlice
+            if(!null? p.parent) {
+                p = p.parent
+            }
+        }
+
+        def newSlice@(lives) (p.localCopy())
+        def use_card newSlice.cardinality
+        if( ( array_length p.elements) >= (use_card - 1) ) {
+            use_card = ( array_length p.elements) + 1
+        }
+        newSlice.elements = (make _:[T] (use_card) item)
+        for p.elements e@(lives):T i {
+            if ( newSlice.start + i < idx ) {
+                set newSlice.elements i e
+            } {
+                if( idx == ( newSlice.start + i )) {
+                    set newSlice.elements i item
+                    set newSlice.elements (i + 1) e
+                } {
+                    set newSlice.elements (i + 1) e
+                }                
+            }            
+        }
+        
+        newSlice.end = newSlice.end + 1
+        newSlice.cardinality = use_card
+        if ( (idx - newSlice.start) >= p.cardinality ) {
+            newSlice.end = idx + 1
+        }
+        newSlice.parent = p.parent
+        res.parent = newSlice
+        return root
+    }
+
+    fn get:T (idx:int) {
+        if( idx < 0 ) {
+            ; should be runtime error here...
+            return (itemAt elements 0)
+        } 
+        if( idx >= start && idx < end ) {
+            return (itemAt elements (idx - start))
+        }
+        def p@(weak):S parent
+        while( (!null? p) && (idx < p.start) ) {
+            p = p.parent
+        }
+        if(!null? p ) {
+            return (itemAt p.elements (idx - p.start))
+        }
+        return (itemAt elements 0)
+    }    
+    fn add:S (item:T) {
+        if((end - start) >= cardinality) {
+            def res (new S)
+            res.start = this.end
+            res.end = (this.end + 1)
+            res.parent = this
+            res.cardinality = (cardinality + 1)
+            res.elements = (make _:[T] (res.cardinality) item)
+            set res.elements 0 item
+            return res
+        }
+        def res (new S)
+        res.elements = (make _:[T] (cardinality) item)
+        for elements e@(lives):T i {
+            set res.elements i e
+        }
+        set res.elements (end - start) item
+        res.parent = parent
+        res.start = start
+        res.end = end + 1
+        res.cardinality = cardinality
+        return res
+    }
+
+    fn count:int () {
+        return end
+    }
+
+    ; TODO: faster version ....
+    fn map:S (cb:(_:T (item:T)) ) {
+        def len (this.count())
+        def res:S (new S)
+        def cnt (this.count())
+        def i 0
+        while( i < cnt ) {
+            def item (this.get(i))
+            ; set res i (cb(item))
+            def new_value (cb(item))
+            res = (res.add(new_value))
+            i = i + 1
+        }
+        return res
+    }     
+
+    fn mapper:S (cb:(_:T (item:T)) ) {
+        def len (this.count())
+        def res:S (new S)
+        def cnt (this.count())
+        def i 0
+        while( i < cnt ) {
+            def item (this.get(i))
+            ; set res i (cb(item))
+            def new_value (cb(item))
+            res = (res.add(new_value))
+            i = i + 1
+        }
+        return res
+    }      
+
+}
+
+
+operator type:Vector all {
+
+    ; couple of trait test functions for now...
+    fn hello@(weak):S () {
+        print "immutable says hi! my size is " + (self.count())
+        return self
+    }
+    fn hello@(weak):S (msg:string) {
+        print "immutable sends message " + msg + " AND my size is " + (self.count())
+        return self
+    }
+    ; fn get:T (idx:int) {
+    fn itemAt:T (idx:int) { 
+        ; def val:T  (self.get(idx))
+        def val (self.get(idx))
+        return val
+    } 
+    fn imm_itemAt:T (idx:int) { 
+        ; def val:T  (self.get(idx))
+        def val (self.get(idx))
+        return val
+    } 
+    ; fn push:S () {}
+    fn push:S (item:T) {
+        return (self.add(item))
+    }
+    fn +:S (item:T) {
+        return (self.add(item))
+    }
+    fn last:T () {
+        ; def len (self.count())
+        ; def last_idx ((self.count()) - 1)
+        ; return (self.get( last_idx ))
+        return (itemAt self ((self.count()) - 1) )
+    }
+    fn array_length:int () {
+        return (self.count())
+    }    
+    fn length:int () {
+        return (self.count())
+    }    
+    fn forEach:void (cb:(_:void (item:T))) {
+        def cnt (self.count())
+        def i 0
+        while( i < cnt ) {
+            def item (itemAt self i)
+            cb(item)
+            i = i + 1
+        }
+    }
+
+    fn map:S ( cb:(_:T (item:T)) ) {
+        def len (self.count())
+        def res (new S) 
+        def cnt (self.count())
+        def i 0
+        while( i < cnt ) {
+            def item (itemAt self i)
+            ; set res i (cb(item)
+            def value (cb(item))
+            res = res.add(value)
+            i = i + 1
+        }
+        return res
+    }     
+
+    ; TODO: faster version ....
+    fn map:[K] (cb:(_:K (item:T)) to@(noeval):[K] ) {
+        def len (self.count())
+        def res:[K] 
+        def cnt (self.count())
+        def i 0
+        while( i < cnt ) {
+            def item (itemAt self i)
+            ; set res i (cb(item))
+            push res (cb(item))
+            i = i + 1
+        }
+        return res
+    }     
+
+
+}
+
+operator type:Map all {
+    fn  imm_keys:[K] () {
+        return (keys self.elements)
+    }
+    fn  keys:[K] () {
+        return (keys self.elements)
+    }
+    fn  get@(optional):T (key:K) {
+        return (get self.elements key)
+    }
+    fn  imm_get@(optional):T (key:K) {
+        return (get self.elements key)
+    }
+    fn  remap:S () {
+        def obj (new S)
+        return obj
+    }
+    fn  imm_has:boolean (key:K) {
+        return (has self.elements key)
+    }
+    fn  has:boolean (key:K) {
+        return (has self.elements key)
+    }
+    fn  imm_set:S (key:K value:T) {
+        def c (new S)        
+        def keys ( keys self.elements)
+        for keys k:string i {
+            if(k==key) {
+
+            } {
+                set c.elements k (unwrap (get self.elements k))
+            }
+        }
+        set c.elements key value
+        return c
+    }
+}
+
+operator type:Map all {
+    fn  set:S (key:K value:T) {
+        def c (new S)        
+        def keys ( keys self.elements)
+        for keys k:string i {
+            if(k==key) {
+
+            } {
+                set c.elements k (unwrap (get self.elements k))
+            }
+        }
+        set c.elements key value
+        return c
+    }
+    fn  forEach@(weak):S ( cb:(_:void (value:T key:K)) ) {
+        def keys (keys self.elements)
+        for keys key:K i {
+            cb( (unwrap (get self.elements key)) key )
+        }
+        return self
+    }
+
+}
+
+

package/dist/lib/lib/IndexedDB.rgr

@@ -0,0 +1,32 @@
+
+systemclass IndexedDBDatabase {
+  es6 IDBDatabase
+}
+
+; window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB || window.shimIndexedDB
+
+operator type:void es6 {
+
+  fn open_idb:IDBDatabase (name:sting version:int) ('(window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB || window.shimIndexedDB).open('(e 1)', '(e 2)')')
+
+
+
+  fn schema:SQLSchemaBuilder (name:string version:int) (`lf.schema.create(`(e 1)`,`(e 2)`)`)
+  fn create_table:SQLSchemaTable (  s:SQLSchemaBuilder name:string ) ( (e 1) `.createTable(`(e 2)`)`)
+
+  fn add_int (t:SQLSchemaTable fieldName:string ) ( (e 1) `.addColumn(`(e 2)`, lf.Type.INTEGER)`)
+  fn add_string (t:SQLSchemaTable fieldName:string ) ( (e 1) `.addColumn(`(e 2)`, lf.Type.STRING)`)
+  fn add_datetime (t:SQLSchemaTable fieldName:string ) ( (e 1) `.addColumn(`(e 2)`, lf.Type.DATE_TIME)`)
+  fn add_boolean (t:SQLSchemaTable fieldName:string ) ((e 1) `.addColumn(`(e 2)`, lf.Type.BOOLEAN)`)
+  fn set_primary_key (t:SQLSchemaTable fieldName:string) ((e 1) `.addPrimaryKey([`(e 2)`])`)
+  fn create_index (t:SQLSchemaTable indexName:string fields:[string]) ( (e 1) `.addIndex(`(e 2)`,`(e 3)`,false,lf.Order.DESC)`)
+
+  fn connect@(async):SQLDatabase (b:SQLSchemaBuilder) ('await ' (e 1) '.connect()')
+  fn getSchema:DBSchema (db:SQLDatabase) ( (e 1) '.getSchema()')
+  fn getTable:DBTable (db:DBSchema name:string) ( (e 1) '.table(' (e 2) ')')
+
+  fn addRow:DBInsertableRow (tbl:DBTable row:JSONDataObject) (  (e 1) '.createRow(' (e 2) ')') 
+  fn insert@(async):void (db:SQLDatabase t:DBTable rows:[DBInsertableRow]) ('await (' (e 1) '.insertOrReplace().into(' (e 2) ').values(' (e 3) ').exec())')
+  ; fn query@(async):[JSONDataObject] (db:SQLDatabase t:DBTable id:int ) ('await (' (e 1) '.select().from(' (e 2) ').where(' (e 2) '.id.eq(' (e 3)')).exec())')
+  fn select@(async):[JSONDataObject] (db:SQLDatabase t:DBTable id:int ) ('await (' (e 1) '.select().from(' (e 2) ').where(' (e 2) '.id.eq(' (e 3)')).exec())')
+}

package/{compiler/JSON.clj → dist/lib/lib/JSON.rgr}

@@ -10,15 +10,19 @@
 systemclass JSONDataObject {
     es6 Object
     java7 JSONObject ( (imp "org.json.JSONObject") )
+    kotlin JSONObject
     go "map[string]interface{}"
     swift3 '[String:Any]'
+    swift6 '[String:Any]'
 }
 
 systemclass JSONArrayObject {
-    es6 "Array<any>"
+    es6 JSONArrayObject2
     java7 JSONArray ( (imp "org.json.JSONArray") )
+    kotlin JSONArray
     go "[]interface{}"
     swift3 '[Any]'
+    swift6 '[Any]'
 }
 
 systemclass JSONKeyValue {
@@ -28,8 +32,10 @@ systemclass JSONKeyValue {
 systemclass JSONValueUnion {
     es6 Object
     java7 Object
+    kotlin Any?
     go "interface{}"
     swift3 Any
+    swift6 Any
 }
 
 systemunion JSONValueUnion ( JSONDataObject JSONArrayObject string int double boolean )
@@ -79,8 +85,17 @@ operators {
                 "(typeof (" (e 1) " [" (e 2) "]) != \"string\" ) ? undefined : " (e 1) " [" (e 2) "] " nl
             )
             swift3 (  (e 1) '[' (e 2) '] as? String ')
+            swift6 (  (e 1) '[' (e 2) '] as? String ')
             ranger ("(getStr " (e 1) " " (e 2) ")")
             java7 ( (e 1) ".isNull( " (e 2) " ) ? null : " (e 1) ".optString(" (e 2) ") " )
+            kotlin ( "(if (" (e 1) ".isNull(" (e 2) ")) null else " (e 1) ".optString(" (e 2) "))"
+(create_polyfill "
+typealias JSONObject = org.json.JSONObject
+typealias JSONArray = org.json.JSONArray
+typealias JSONDataObject = org.json.JSONObject
+typealias JSONArrayObject = org.json.JSONArray
+")
+            )
             go ( "r_get_opt_json_string(" (e 1) ", " (e 2) ")"
 (create_polyfill "
 func r_get_opt_json_string( data map[string]interface{}, key string ) *GoNullable  {
@@ -111,8 +126,10 @@ func r_get_opt_json_string( data map[string]interface{}, key string ) *GoNullabl
                 "isNaN( parseInt(" (e 1) " [" (e 2) "]) ) ? undefined : parseInt(" (e 1) " [" (e 2) "]) " nl
             )
             swift3 (  (e 1) '[' (e 2) '] as? Int ')
+            swift6 (  (e 1) '[' (e 2) '] as? Int ')
             ranger( "(getInt " (e 1 )" " (e 2)")")
             java7 ( (e 1) ".isNull( " (e 2) " ) ? null : " (e 1) ".optInt(" (e 2) ") " )
+            kotlin ( "(if (" (e 1) ".isNull(" (e 2) ")) null else " (e 1) ".optInt(" (e 2) "))" )
             go ( "r_get_opt_json_int(" (e 1) ", " (e 2 ) ")"
 (create_polyfill "
 func r_get_opt_json_int( data map[string]interface{}, key string ) *GoNullable  {
@@ -142,8 +159,10 @@ func r_get_opt_json_int( data map[string]interface{}, key string ) *GoNullable
                 "isNaN( parseFloat(" (e 1) " [" (e 2) "]) ) ? undefined : parseFloat(" (e 1) " [" (e 2) "]) " nl
             )
             swift3 (  (e 1) '[' (e 2) '] as? Double ')
+            swift6 (  (e 1) '[' (e 2) '] as? Double ')
             ranger( "(getDouble " (e 1 )" " (e 2)")")
             java7 ( (e 1) ".isNull( " (e 2) " ) ? null : " (e 1) ".optDouble(" (e 2) ") " )
+            kotlin ( "(if (" (e 1) ".isNull(" (e 2) ")) null else " (e 1) ".optDouble(" (e 2) "))" )
             go ( "r_get_opt_json_double(" (e 1) ", " (e 2) ")"
 (create_polyfill "
 func r_get_opt_json_double( data map[string]interface{}, key string ) *GoNullable  {
@@ -173,8 +192,10 @@ func r_get_opt_json_double( data map[string]interface{}, key string ) *GoNullabl
                 "typeof(" (e 1) " [" (e 2) "]) === \"undefined\" ? undefined :(" (e 1) " [" (e 2) "]) " 
             )
             swift3 (  (e 1) '[' (e 2) '] as? Bool ')
+            swift6 (  (e 1) '[' (e 2) '] as? Bool ')
             ranger( "(getBoolean " (e 1 )" " (e 2)")")
             java7 ( (e 1) ".isNull( " (e 2) " ) ? null : " (e 1) ".optBoolean(" (e 2) ") " )
+            kotlin ( "(if (" (e 1) ".isNull(" (e 2) ")) null else " (e 1) ".optBoolean(" (e 2) "))" )
             go ( "r_get_opt_json_bool(" (e 1) ", " (e 2) ")"
 (create_polyfill "
 func r_get_opt_json_bool( data map[string]interface{}, key string ) *GoNullable  {
@@ -203,6 +224,7 @@ func r_get_opt_json_bool( data map[string]interface{}, key string ) *GoNullable
                 "(" (e 1) "[" (e 2) "] instanceof Object ) ? " (e 1) " [" (e 2) "] : undefined " 
             )
             swift3 (  (e 1) '[' (e 2) '] as? [String:Any] ')
+            swift6 (  (e 1) '[' (e 2) '] as? [String:Any] ')
             ranger ( '(getObject ' (e 1) ' ' (e 2) ')')
             java7 ( "__getJSONObj(" (e 1) ", " (e 2) " )" (imp 'org.json.JSONException')
 
@@ -221,6 +243,7 @@ static JSONObject __getJSONObj(JSONObject o, String item)
 ')    
                         
             )
+            kotlin ( "(if (" (e 1) ".isNull(" (e 2) ")) null else " (e 1) ".getJSONObject(" (e 2) "))" )
             go ( "r_get_opt_json_obj(" (e 1) ", " (e 2) ")"
 (create_polyfill "
 func r_get_opt_json_obj( data map[string]interface{}, key string ) *GoNullable  {
@@ -251,8 +274,10 @@ func r_get_opt_json_obj( data map[string]interface{}, key string ) *GoNullable
                 "(" (e 1) "[" (e 2) "] instanceof Array ) ? " (e 1) " [" (e 2) "] : undefined " 
             )
             swift3 (  (e 1) '[' (e 2) '] as? [Any] ')
+            swift6 (  (e 1) '[' (e 2) '] as? [Any] ')
             ranger ("(getArray " (e 1) " " (e 2) ")")
             java7 ( (e 1) ".isNull( " (e 2) " ) ? null : " (e 1) ".getJSONArray(" (e 2) ") " )
+            kotlin ( "(if (" (e 1) ".isNull(" (e 2) ")) null else " (e 1) ".getJSONArray(" (e 2) "))" )
             go ( "r_get_opt_array(" (e 1) ", " (e 2) ")"
 (create_polyfill '
 func r_get_opt_array( data map[string]interface{}, key string ) *GoNullable  {
@@ -361,6 +386,7 @@ static Object __getJSONValue(JSONArray o, Integer item)
             
              )
             swift3 ( (e 1) "[" (e 2) "]")
+            kotlin ( (e 1) ".get(" (e 2) ")")
             go ( (e 1) "[" (e 2) "]")
             php ( (e 1) "[" (e 2) "]")
         }
@@ -371,7 +397,9 @@ static Object __getJSONValue(JSONArray o, Integer item)
             ranger ("(array_length " (e 1) ")")
             es6 ( (e 1) ".length") 
             java7 ( (e 1) ".length()" )
+            kotlin ( (e 1) ".length()" )
             swift3 ( (e 1) ".count")
+            swift6 ( (e 1) ".count")
             go( "int64(len(" (e 1) "))" )
             php ( "count(" (e 1) ")" )
         }
@@ -382,8 +410,62 @@ static Object __getJSONValue(JSONArray o, Integer item)
             ranger ( "(set " (e 1) " " (e 2) " " (e 3) " )")
             es6 ( (e 1) "[" (e 2)"] = " (e 3) ";")
             java7 ( (e 1) ".put(" (e 2)" , " (e 3) ");")
+            kotlin ( (e 1) ".put(" (e 2)" , " (e 3) ");")
+            go ( (e 1) "[" (e 2) "] = " (e 3) )
+            swift3 ( (e 1) "[" (e 2) "] = " (e 3) )
+            swift6 ( (e 1) "[" (e 2) "] = " (e 3) )
+            php ( (e 1) "[" (e 2) "] = " (e 3) ";" )
+        }
+    }
+
+    set _@(moves@( 3 1 ) ):void (e@(mutates):JSONDataObject key:string value:string) {
+        templates {
+            ranger ( "(set " (e 1) " " (e 2) " " (e 3) " )")
+            es6 ( (e 1) "[" (e 2)"] = " (e 3) ";")
+            java7 ( (e 1) ".put(" (e 2)" , " (e 3) ");")
+            kotlin ( (e 1) ".put(" (e 2)" , " (e 3) ");")
+            go ( (e 1) "[" (e 2) "] = " (e 3) )
+            swift3 ( (e 1) "[" (e 2) "] = " (e 3) )
+            swift6 ( (e 1) "[" (e 2) "] = " (e 3) )
+            php ( (e 1) "[" (e 2) "] = " (e 3) ";" )
+        }
+    }
+
+    set _@(moves@( 3 1 ) ):void (e@(mutates):JSONDataObject key:string value:int) {
+        templates {
+            ranger ( "(set " (e 1) " " (e 2) " " (e 3) " )")
+            es6 ( (e 1) "[" (e 2)"] = " (e 3) ";")
+            java7 ( (e 1) ".put(" (e 2)" , " (e 3) ");")
+            kotlin ( (e 1) ".put(" (e 2)" , " (e 3) ");")
+            go ( (e 1) "[" (e 2) "] = " (e 3) )
+            swift3 ( (e 1) "[" (e 2) "] = " (e 3) )
+            swift6 ( (e 1) "[" (e 2) "] = " (e 3) )
+            php ( (e 1) "[" (e 2) "] = " (e 3) ";" )
+        }
+    }
+
+    set _@(moves@( 3 1 ) ):void (e@(mutates):JSONDataObject key:string value:double) {
+        templates {
+            ranger ( "(set " (e 1) " " (e 2) " " (e 3) " )")
+            es6 ( (e 1) "[" (e 2)"] = " (e 3) ";")
+            java7 ( (e 1) ".put(" (e 2)" , " (e 3) ");")
+            kotlin ( (e 1) ".put(" (e 2)" , " (e 3) ");")
             go ( (e 1) "[" (e 2) "] = " (e 3) )
             swift3 ( (e 1) "[" (e 2) "] = " (e 3) )
+            swift6 ( (e 1) "[" (e 2) "] = " (e 3) )
+            php ( (e 1) "[" (e 2) "] = " (e 3) ";" )
+        }
+    }
+
+    set _@(moves@( 3 1 ) ):void (e@(mutates):JSONDataObject key:string value:boolean) {
+        templates {
+            ranger ( "(set " (e 1) " " (e 2) " " (e 3) " )")
+            es6 ( (e 1) "[" (e 2)"] = " (e 3) ";")
+            java7 ( (e 1) ".put(" (e 2)" , " (e 3) ");")
+            kotlin ( (e 1) ".put(" (e 2)" , " (e 3) ");")
+            go ( (e 1) "[" (e 2) "] = " (e 3) )
+            swift3 ( (e 1) "[" (e 2) "] = " (e 3) )
+            swift6 ( (e 1) "[" (e 2) "] = " (e 3) )
             php ( (e 1) "[" (e 2) "] = " (e 3) ";" )
         }
     }
@@ -393,8 +475,10 @@ static Object __getJSONValue(JSONArray o, Integer item)
             ranger ( "(set " (e 1) " " (e 2) " " (e 3) " )")
             es6 ( (e 1) "[" (e 2)"] = " (e 3) ";")
             java7 ( (e 1) ".put(" (e 2)" , " (e 3) ");")
+            kotlin ( (e 1) ".put(" (e 2)" , " (e 3) ");")
             go ( (e 1) "[" (e 2) "] = " (e 3) )
             swift3 ( (e 1) "[" (e 2) "] = " (e 3) )
+            swift6 ( (e 1) "[" (e 2) "] = " (e 3) )
             php ( (e 1) "[" (e 2) "] = " (e 3) ";" )
         }
     }
@@ -406,7 +490,9 @@ static Object __getJSONValue(JSONArray o, Integer item)
                 "JSON.parse(" (e 1) ")"
             )
             swift3 ( 'try JSONSerialization.jsonObject(with: ' (e 1) ', options:[]) as! [String:Any]' (imp 'Foundation') )
+            swift6 ( 'try JSONSerialization.jsonObject(with: ' (e 1) ', options:[]) as! [String:Any]' (imp 'Foundation') )
             java7 ("new JSONObject(" (e 1) ")"  (imp "org.json.JSONObject") (plugin 'maven' (  (dep 'org.json' 'json' '20171018'  ) ) ))
+            kotlin ("JSONObject(" (e 1) ")")
             go ( "__r_json_to_interface(" (e 1) ")" (imp "encoding/json")
 
 (create_polyfill "
@@ -448,8 +534,16 @@ function r_json_to_array($str) {
              i nl '} catch {' nl I
                 'return ""'
                 i nl '}'
-            '}()' (imp 'Foundation') )
+            i nl '}()' (imp 'Foundation') )
+                swift6 ( '{ () -> String in ' nl I
+                 'do {' nl I
+                     'return String(data:try JSONSerialization.data(withJSONObject: ' (e 1) ', options:[]), encoding:.utf8)!'
+                 i nl '} catch {' nl I
+                     'return ""'
+                     i nl '}'
+                i nl '}()' (imp 'Foundation') )
             java7 ( (e 1) ".toString()" )
+            kotlin ( (e 1) ".toString()" )
             go( "__toJSONData(" (e 1) ")" (imp "encoding/json")
 (create_polyfill "
 func __toJSONData ( data interface{} ) string {
@@ -469,7 +563,9 @@ func __toJSONData ( data interface{} ) string {
                 "JSON.stringify(" (e 1) ")"
             )
             swift3 ( 'String(data:try JSONSerialization.data(with: ' (e 1) ', options:[], encoding:.utf8)!)' (imp 'Foundation') )
+            swift6 ( 'String(data:try JSONSerialization.data(with: ' (e 1) ', options:[], encoding:.utf8)!)' (imp 'Foundation') )
             java7 ( (e 1) ".toString()" )
+            kotlin ( (e 1) ".toString()" )
             go( "__toJSONData(" (e 1) ")" (imp "encoding/json")
 (create_polyfill "
 func __toJSONData ( data interface{} ) string {
@@ -487,7 +583,9 @@ func __toJSONData ( data interface{} ) string {
             ranger ( "(push " (e 1 ) " " (e 2) " )")
             es6 ( (e 1) ".push(" (e 2) ")")
             java7 ( (e 1) ".put(" (e 2) ");")
+            kotlin ( (e 1) ".put(" (e 2) ");")
             swift3 ( (e 1) ".append(" (e 2) ");")
+            swift6 ( (e 1) ".append(" (e 2) ");")
             go( (e 1) " = append(" (e 1) "," (e 2) ")")
             php ( "array_push(" (e 1) ", " (e 2) ");")
         }           
@@ -496,8 +594,10 @@ func __toJSONData ( data interface{} ) string {
         templates {
             es6 ("[]")
             swift3 ( '[Any]()' )
+            swift6 ( '[Any]()' )
             ranger ("(json_array )")
             java7 ("new JSONArray()" (imp "org.json.JSONArray") (plugin 'maven' (  (dep 'org.json' 'json' '20171018'  ) ) ))
+            kotlin ("JSONArray()")
             go ( "make([]interface{},0)" )
             php ( "array()" )
         }        
@@ -506,8 +606,10 @@ func __toJSONData ( data interface{} ) string {
         templates {
             es6 ("{}")
             swift3 ( '[String:Any]()' )
+            swift6 ( '[String:Any]()' )
             ranger ("(json_object )")
             java7 ("new JSONObject()" (imp "org.json.JSONObject") (plugin 'maven' (  (dep 'org.json' 'json' '20171018'  ) ) ))
+            kotlin ("JSONObject()")
             go ( "make(map[string]interface{})" )
             php ( "array()")
         }        
@@ -516,6 +618,7 @@ func __toJSONData ( data interface{} ) string {
         templates {
             es6 ("[" ( repeat_from 1 (  (block 1) ) ) "]")
             swift3 ("[" ( repeat_from 1 (  (block 1) ) ) "]")
+            swift6 ("[" ( repeat_from 1 (  (block 1) ) ) "]")
             ranger ("(json_array " ( repeat 1 (  (block 1) ) ) ")")
             java7 ("new JSONArray" (imp "org.json.JSONArray") (plugin 'maven' (  (dep 'org.json' 'json' '20171018'  ) ) ))
             go ( "make([]interface{},0)" )
@@ -596,4 +699,4 @@ func __toJSONData ( data interface{} ) string {
             ranger ("(json.attr " (e 1) " " (e 2) ")")
         }
     }  
-}
+}