Pārlūkot izejas kodu

Lua : Rebase, and fix things up a bit

I tried to run some tests, and saw some messages that looked like
related to some recent fixes.  I decided to rebase the haxe_lua branch
on top of the latest from foundation/develop.  There were a few small
things I needed to tweak to get things back up and running.
Justin Donaldson 10 gadi atpakaļ
vecāks
revīzija
ab7154cfa5
2 mainītis faili ar 2 papildinājumiem un 5 dzēšanām
  1. 1 5
      genlua.ml
  2. 1 0
      src/typing/common.ml

+ 1 - 5
genlua.ml

@@ -706,10 +706,6 @@ and gen_expr ctx e =
 
 and gen_block_element ?(after=false) ctx e =
 	match e.eexpr with
-	| TLocal _ | TLocal _ ->
-		spr ctx "(function() return ";
-		gen_expr ctx e;
-		spr ctx " end)()";
 	| TBinop (Ast.OpEq as op,e1,e2) ->
 		spr ctx "(function() return ";
 		gen_tbinop ctx op e1 e2;
@@ -1220,7 +1216,7 @@ let generate_type ctx = function
 			()
 		else if not c.cl_extern then
 			generate_class ctx c
-		else if (Meta.has Meta.LuaRequire c.cl_meta) && (Meta.has Meta.ReallyUsed c.cl_meta) then
+		else if (Meta.has Meta.LuaRequire c.cl_meta) then
 			generate_require ctx c
 		else if Meta.has Meta.InitPackage c.cl_meta then
 			(match c.cl_path with

+ 1 - 0
src/typing/common.ml

@@ -593,6 +593,7 @@ let get_config com =
 			pf_overload = false;
 			pf_pattern_matching = false;
 			pf_can_skip_non_nullable_argument = true;
+			pf_reserved_type_paths = [];
 		}
 	| Neko ->
 		{