Bladeren bron

Lua : Just use simple strings for lua filehandle types

Justin Donaldson 9 jaren geleden
bovenliggende
commit
7ec37f01d4
2 gewijzigde bestanden met toevoegingen van 2 en 9 verwijderingen
  1. 1 7
      std/lua/FileHandle.hx
  2. 1 2
      std/lua/_std/sys/io/File.hx

+ 1 - 7
std/lua/FileHandle.hx

@@ -2,16 +2,10 @@ package lua;
 
 extern class FileHandle extends UserData {
 	public function flush() : Void;
-	public function read(arg : haxe.extern.EitherType<ReadOption,Int>) : String;
+	public function read(arg : haxe.extern.EitherType<String,Int>) : String;
 	public function close() : Void;
 
 	@:overload(function () : Int {})
 	public function seek(arg : String, pos : Int) : Void;
 }
 
-@:enum
-abstract ReadOption(String) {
-	var All = "*all";
-	var Line = "*line";
-	var Number = "*number";
-}

+ 1 - 2
std/lua/_std/sys/io/File.hx

@@ -22,13 +22,12 @@
 package sys.io;
 import lua.Lua;
 import lua.Io;
-import lua.FileHandle.ReadOption;
 
 @:coreApi
 class File {
 	public static function getContent( path : String ) : String { 
 		var f = Io.open(path, "r");
-		var s = f.read(All);
+		var s = f.read("*all");
 		f.close();
 		return s;
 	}