[lua] more map and loop spacing tweaks

src/generators/genlua.ml

@@ -482,7 +482,6 @@ and gen_loop ctx label cond e =
     print ctx " do ";
     if will_continue then print ctx "repeat ";
     gen_block_element ctx e;
-    newline ctx;
     if will_continue then begin
         if will_continue then begin
             println ctx "until true";
@@ -496,6 +495,7 @@ and gen_loop ctx label cond e =
         println ctx "end;";
     end;
     b();
+    newline ctx;
     print ctx "end";
     ctx.in_loop <- old_in_loop;
     ctx.break_depth <- ctx.break_depth-1;

std/lua/_std/haxe/ds/IntMap.hx

@@ -48,24 +48,25 @@ class IntMap<T> implements haxe.Constraints.IMap<Int,T> {
 	}
 
 	public inline function exists( key : Int ) : Bool {
-		return Lua.rawget(h,key) != null;
+		return h[key] != null;
 	}
 
 	public function remove( key : Int ) : Bool {
-		if (Lua.rawget(h,key) == null){
+		if (h[key] == null){
 			return false;
 		} else {
-			Lua.rawset(h,key,null);
+			h[key] = null;
 			return true;
 		}
 	}
 
 	public function keys() : Iterator<Int> {
-		var cur = Lua.next(h,null).index;
+		var next = Lua.next;
+		var cur = next(h,null).index;
 		return {
 			next : function() {
 				var ret = cur;
-				cur = Lua.next(h,cur).index;
+				cur = next(h,cur).index;
 				return cast ret;
 			},
 			hasNext : function() return cur != null

std/lua/_std/haxe/ds/StringMap.hx

@@ -48,27 +48,28 @@ class StringMap<T> implements haxe.Constraints.IMap<String,T> {
 	}
 
 	public inline function exists( key : String ) : Bool untyped {
-		return Lua.rawget(h,key) != null;
+		return h[key] != null;
 	}
 
 	public function remove( key : String ) : Bool untyped {
-		if (Lua.rawget(h,key) == null){
+		if (h[key] == null){
 			return false;
 		} else {
-			Lua.rawset(h,key,null);
+			h[key] = null;
 			return true;
 		}
 	}
 
 	public function keys() : Iterator<String> {
-		var cur = Lua.next(h,null).index;
+		var next = Lua.next;
+		var cur = next(h,null).index;
 		return {
 			next : function() {
 				var ret = cur;
-				cur = Lua.next(h,cur).index;
+				cur = next(h,cur).index;
 				return cast ret;
 			},
-			hasNext : function() return cur != null 
+			hasNext : function() return cur != null
 		}
 	}