fix overflow on bigint platforms (close #42)

.travis.yml

@@ -4,11 +4,10 @@ os:
   - linux
   - osx
 
-sudo: false
+osx_image: xcode6.4
-dist: trusty
 
 haxe:
-  - "3.4.7"
+  - "3.2.1"
   - development
 
 addons:
@@ -19,42 +18,45 @@ addons:
       - g++-multilib
       # Python
       - python3
+      # PHP
+      - php5-cli
       # C#
       - mono-devel
       - mono-mcs
       # Flash
-      - libglib2.0
+      - libcurl3:i386
-      - libfreetype6
+      - libglib2.0-0:i386
+      - libx11-6:i386
+      - libxext6:i386
+      - libxt6:i386
+      - libxcursor1:i386
+      - libnss3:i386
+      - libgtk2.0-0:i386
 
 install:
   # os-specific config
   - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
       export DISPLAY=:99.0;
       export AUDIODEV=null;
-      phpenv global 7.0;
     elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then
       brew update;
       brew install mono;
-      brew upgrade python;
+      brew install python3;
-      brew install php;
     fi
   # Download and setup a standalone flash player debugger
   - haxe flash/install.hxml
   # Install haxelibs
   - if [ "${TRAVIS_HAXE_VERSION}" = "development" ]; then
       haxelib git hxcpp https://github.com/HaxeFoundation/hxcpp.git;
-    else
-      haxelib install hxcpp;
-    fi
-  - if [ "${TRAVIS_HAXE_VERSION}" = "development" ] || [ "${TRAVIS_HAXE_VERSION}" = "3.2.1" ]; then
       pushd $(haxelib path hxcpp | head -1);
         pushd tools/hxcpp; haxe compile.hxml; popd;
         pushd project; neko build.n; popd;
       popd;
+    else
+      haxelib install hxcpp;
     fi
   - haxelib install hxjava
   - haxelib install hxcs
-  - haxelib install hx3compat
   - haxelib dev hscript .
   - haxelib list
 
@@ -63,7 +65,6 @@ script:
     haxe build.hxml &&
     popd
   - haxe bin/build-interp.hxml
-  - haxe bin/build-interp.hxml -D hscriptPos
   - haxe bin/build-neko.hxml         && neko bin/Test.n
   - haxe bin/build-js.hxml           && node bin/Test.js
   - haxe bin/build-java.hxml         && java -jar bin/Test.jar

.vscode/launch.json

@@ -1,16 +0,0 @@
-{
-	// Utilisez IntelliSense pour en savoir plus sur les attributs possibles.
-	// Pointez pour afficher la description des attributs existants.
-	// Pour plus d'informations, visitez : https://go.microsoft.com/fwlink/?linkid=830387
-	"version": "0.2.0",
-	"configurations": [
-		{
-			"name": "HashLink (launch)",
-			"request": "launch",
-			"type": "hl",
-			"hxml": "hscript.hxml",
-			"cwd": "${workspaceRoot}",
-			"preLaunchTask": "Build"
-		}
-	]
-}

.vscode/tasks.json

@@ -1,16 +0,0 @@
-{
-	// See https://go.microsoft.com/fwlink/?LinkId=733558
-	// for the documentation about the tasks.json format
-	"version": "2.0.0",
-	"tasks": [
-		{
-			"label": "Build",
-			"type": "hxml",
-			"file": "hscript.hxml",
-			"group": {
-				"kind": "build",
-				"isDefault": true
-			}
-		}
-	]
-}

LICENSE

@@ -1,22 +0,0 @@
-The MIT License
-
-Copyright (C)2008-2017 Haxe Foundation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-

README.md

@@ -64,8 +64,6 @@ You can use `parser.allowJSON` to allow JSON data.
 
 You can use `parser.allowTypes` to parse types for local vars, exceptions, function args and return types. Types are ignored by the interpreter.
 
-You can use `parser.allowMetadata` to parse metadata before expressions on in anonymous types. Metadata are ignored by the interpreter.
-
 You can use `new hscript.Macro(pos).convert(ast)` to convert an hscript AST to a Haxe macros one.
 
 Limitations

Test.hx

@@ -1,13 +1,10 @@
 import haxe.ds.EnumValueMap;
 import haxe.ds.Option;
 import hscript.Macro;
-import hscript.Tools;
-import hscript.Async;
-import hscript.Printer;
 import haxe.unit.*;
 
 class Test extends TestCase {
-	function assertScript(x,v:Dynamic,?vars : Dynamic, allowTypes=false, ?pos:haxe.PosInfos) {
+	function assertScript(x,v:Dynamic,?vars : Dynamic,allowTypes=false) {
 		var p = new hscript.Parser();
 		p.allowTypes = allowTypes;
 		var program = p.parseString(x);
@@ -18,21 +15,14 @@ class Test extends TestCase {
 			for( v in Reflect.fields(vars) )
 				interp.variables.set(v,Reflect.field(vars,v));
 		var ret : Dynamic = interp.execute(program);
-		assertEquals(v, ret, pos);
+		assertEquals(v, ret);
 	}
 
 	function test():Void {
 		assertScript("0",0);
 		assertScript("0xFF", 255);
-		#if !(php || python)
+		assertScript("0xBFFFFFFF", 0xBFFFFFFF);
-			#if haxe3
+		assertScript("0x7FFFFFFF", 0x7FFFFFFF);
-			assertScript("0xBFFFFFFF", 0xBFFFFFFF);
-			assertScript("0x7FFFFFFF", 0x7FFFFFFF);
-			#elseif !neko
-			assertScript("n(0xBFFFFFFF)", 0xBFFFFFFF, { n : haxe.Int32.toNativeInt });
-			assertScript("n(0x7FFFFFFF)", 0x7FFFFFFF, { n : haxe.Int32.toNativeInt } );
-			#end
-		#end
 		assertScript("-123",-123);
 		assertScript("- 123",-123);
 		assertScript("1.546",1.546);
@@ -99,16 +89,6 @@ class Test extends TestCase {
 		assertScript("var a:Array<Dynamic>=[1,2,4]; a[2]", 4, null, true);
 		assertScript("/**/0", 0);
 		assertScript("x=1;x*=-2", -2);
-		assertScript("var f = x -> x + 1; f(3)", 4);
-		assertScript("var f = (x) -> x + 1; f(3)", 4);
-		assertScript("var f = (x:Int) -> x + 1; f(3)", 4);
-		assertScript("var f = (x,y) -> x + y; f(3,1)", 4);
-		assertScript("var f = (x,y:Int) -> x + y; f(3,1)", 4);
-		assertScript("var f = (x:Int,y:Int) -> x + y; f(3,1)", 4);
-		assertScript("var f:Int->Int->Int = (x:Int,y:Int) -> x + y; f(3,1)", 4, null, true);
-		assertScript("var f:(x:Int, y:Int)->Int = (x:Int,y:Int) -> x + y; f(3,1)", 4, null, true);
-		assertScript("var f:(x:Int)->(y:Int, z:Int)->Int = (x:Int) -> (y:Int, z:Int) -> x + y + z; f(3)(1, 2)", 6, null, true);
-		assertScript("var f:(x:Int)->(Int, Int)->Int = (x:Int) -> (y:Int, z:Int) -> x + y + z; f(3)(1, 2)", 6, null, true);
 	}
 	
 	function testMap():Void {
@@ -162,16 +142,9 @@ class Test extends TestCase {
 	}
 
 	static function main() {
-		#if ((haxe_ver < 4) && php)
-		// uncaught exception: The each() function is deprecated. This message will be suppressed on further calls (errno: 8192)
-		// in file: /Users/travis/build/andyli/hscript/bin/lib/Type.class.php line 178
-		untyped __php__("error_reporting(E_ALL ^ E_DEPRECATED);");
-		#end
-
 		var runner = new TestRunner();
 		runner.add(new Test());
 		var succeed = runner.run();
-
 		#if sys
 			Sys.exit(succeed ? 0 : 1);
 		#elseif flash

appveyor.yml

@@ -5,25 +5,20 @@ environment:
     HAXELIB_ROOT: C:\projects\haxelib
 
 install:
-  # http://help.appveyor.com/discussions/problems/5616-not-able-to-build-due-to-problem-in-chocolateyinstallps1
-  - ps: Set-Service wuauserv -StartupType Manual
   # Install the haxe chocolatey package (https://chocolatey.org/packages/haxe)
-  - cinst haxe -version 3.4.7 -y
+  - cinst haxe -version 3.2.1 -y
   - RefreshEnv
   # Setup haxelib
   - mkdir "%HAXELIB_ROOT%"
   - haxelib setup "%HAXELIB_ROOT%"
   # Install test dependencies
-  - ps: Set-Service wuauserv -StartupType Manual
   - cinst php -y
-  - RefreshEnv
   # Download and setup a standalone flash player debugger
   - haxe flash/install.hxml
   # Install project dependencies
-  - haxelib install hxcpp     > log.txt || type log.txt && cmd /C exit 1
+  - haxelib install hxcpp  > log.txt || type log.txt && cmd /C exit 1
-  - haxelib install hxjava    > log.txt || type log.txt && cmd /C exit 1
+  - haxelib install hxjava > log.txt || type log.txt && cmd /C exit 1
-  - haxelib install hxcs      > log.txt || type log.txt && cmd /C exit 1
+  - haxelib install hxcs   > log.txt || type log.txt && cmd /C exit 1
-  - haxelib install hx3compat > log.txt || type log.txt && cmd /C exit 1
   - haxelib dev hscript .
   - haxelib list
 
@@ -40,5 +35,5 @@ test_script:
   - haxe bin/build-cs.hxml           && bin\bin\Test.exe
   - haxe bin/build-cpp.hxml          && bin\Test.exe
   - haxe bin/build-flash.hxml -D fdb && haxe flash\run.hxml bin\Test.swf
-  - haxe bin/build-php.hxml          && php bin\index.php
+  - haxe bin/build-php.hxml          && C:\tools\php\php.exe bin\index.php
   - haxe bin/build-python.hxml       && C:\Python34-x64\python.exe bin\Test.py

bin/build-each.hxml

@@ -1,3 +1,2 @@
 -main Test
 -dce no
--lib hx3compat

flash/.gitignore

@@ -1,5 +1,3 @@
 *.exe
 *.app
 flashplayerdebugger
-LGPL/
-license.pdf

flash/Install.hx

@@ -1,5 +1,4 @@
 import Sys.*;
-import sys.FileSystem.*;
 import sys.io.File.*;
 import haxe.*;
 import haxe.io.*;
@@ -8,11 +7,11 @@ class Install {
 	// https://www.adobe.com/support/flashplayer/downloads.html
 	static var fpDownload(default, never) = switch (systemName()) {
 		case "Linux":
-			"http://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_sa_linux_debug.x86_64.tar.gz";
+			"https://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_sa_debug.i386.tar.gz";
 		case "Mac":
-			"http://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flashplayer_26_sa_debug.dmg";
+			"https://fpdownload.macromedia.com/pub/flashplayer/updaters/21/flashplayer_21_sa_debug.dmg";
 		case "Windows":
-			"http://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flashplayer_26_sa_debug.exe";
+			"http://fpdownload.macromedia.com/pub/flashplayer/updaters/21/flashplayer_21_sa_debug.exe";
 		case _:
 			throw "unsupported system";
 	}
@@ -34,7 +33,7 @@ class Install {
 		case "Mac":
 			"/Library/Application Support/Macromedia/FlashPlayerTrust";
 		case "Windows":
-			Path.join([getEnv("APPDATA"), "Macromedia", "Flash Player", "#Security", "FlashPlayerTrust"]);
+			Path.join([getEnv("SYSTEMROOT"), "system32", "Macromed", "Flash", "FlashPlayerTrust"]);
 		case _:
 			throw "unsupported system";
 	}
@@ -46,8 +45,9 @@ class Install {
 					throw "failed to download flash player";
 				if (command("tar", ["-xf", Path.withoutDirectory(fpDownload), "-C", "flash"]) != 0)
 					throw "failed to extract flash player";
-				deleteFile(Path.withoutDirectory(fpDownload));
 			case "Mac":
+				if (command("brew", ["tap", "caskroom/versions"]) != 0)
+					throw "failed to brew tap caskroom/versions";
 				if (command("brew", ["cask", "install", "flash-player-debugger"]) != 0)
 					throw "failed to install flash-player-debugger";
 			case "Windows":
@@ -84,7 +84,7 @@ class Install {
 					if (command("sudo", ["chmod", "a+rw", dir]) != 0)
 						throw 'cannot set permission of $dir';
 				case _:
-					throw 'cannot create $dir: $e';
+					neko.Lib.rethrow(e);
 			}
 		}
 	}

flash/Run.hx

@@ -21,13 +21,12 @@ class Run {
 		var exitCode = switch (systemName()) {
 			case "Linux":
 				// The flash player has some issues with unexplained crashes,
-				// but if it runs about 16 times, it should succeed one of those...
+				// but if it runs about 8 times, it should succeed one of those...
 				var c = -1;
-				for (i in 0...16) {
+				for (i in 0...8) {
-					if ((c = command("xvfb-run", ["-a", "flash/flashplayerdebugger", swf])) == 0)
+					if ((c = command("xvfb-run", ["flash/flashplayerdebugger", swf])) == 0)
 						break;
 					println('retry... (${i+1})');
-					sleep(1.5);
 				}
 				c;
 			case "Mac":

haxelib.json

@@ -3,7 +3,7 @@
   "url": "https://github.com/HaxeFoundation/hscript",
   "license": "MIT",
   "description": "Haxe Script is a scripting engine for a subset of the Haxe language",
-  "version": "2.3.0",
+  "version": "2.0.7",
-  "releasenote": "",
+  "releasenote": "fixes for haxe 3.3, use property access by default",
   "contributors": ["ncannasse"]
 }

hscript.hxml

@@ -1,2 +1 @@
-bin/build-each.hxml
+bin/build-flash.hxml
--hl bin/Test.hl

hscript/Async.hx

@@ -1,504 +0,0 @@
-/*
- * Copyright (C)2008-2017 Haxe Foundation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-package hscript;
-import hscript.Expr;
-
-class Async {
-
-	var varNames : Array<String>;
-	var currentFun : String;
-	var currentLoop : Expr;
-	var currentBreak : Expr -> Expr;
-	var uid = 0;
-
-	static var nullExpr : Expr = #if hscriptPos { e : null, pmin : 0, pmax : 0, origin : "<null>", line : 0 } #else null #end;
-	static var nullId = mk(EIdent("null"), nullExpr);
-
-	inline static function expr( e : Expr ) {
-		return #if hscriptPos e.e #else e #end;
-	}
-
-	inline static function mk( e, inf : Expr ) : Expr {
-		return #if hscriptPos { e : e, pmin : inf.pmin, pmax : inf.pmax, origin : inf.origin, line : inf.line } #else e #end;
-	}
-
-	/**
-		Convert a script into asynchronous one.
-		- calls such as foo(a,b,c) are translated to a_foo(function(r) ...rest, a,b,c) where r is the result value
-		- object access such obj.bar(a,b,c) are translated to obj.a_bar(function(r) ...rest, a, b, c)
-		- @async expr will execute the expression but continue without waiting for it to finish
-		- @split [ e1, e2, e3 ] is transformed to split(function(_) ...rest, [e1, e2, e3]) which
-		  should execute asynchronously all expressions - until they return - before continuing the execution
-		- for(i in v) block; loops are translated to the following:
-			var _i = makeIterator(v);
-			function _loop() {
-				if( !_i.hasNext() ) return;
-				var v = _i.next();
-				block(function(_) _loop());
-			}
-			_loop()
-		- while loops are translated similar to for loops
-		- break and continue are correctly handled
-		- you can use @sync <expr> to disable async transformation in some code parts (for performance reason)
-		- a few expressions are still not supported (complex calls, try/catch, and a few others)
-
-		In these examples ...rest represents the continuation of execution of the script after the expression
-	**/
-	public static function toAsync( e : Expr, topLevelSync = false ) {
-		var a = new Async();
-		return a.build(e, topLevelSync);
-	}
-
-	public function build( e : Expr, topLevelSync = false ) {
-		if( topLevelSync ) {
-			return buildSync(e,null);
-		} else {
-			var nothing = ignore();
-			return new Async().toCps(e, nothing, nothing);
-		}
-	}
-
-	function buildSync( e : Expr, exit : Expr ) : Expr {
-		switch( expr(e) ) {
-		case EFunction(_,_,name,_):
-			if( name != null )
-				return toCps(e, null, null);
-			return e;
-		case EBlock(el):
-			var v = saveVars();
-			for( e in el )
-				switch( expr(e) ) {
-				case EFunction(_, _, name, _) if( name != null ): varNames.push(name);
-				default:
-				}
-			var e = block([for(e in el) buildSync(e,exit)], e);
-			restoreVars(v);
-			return e;
-		case EMeta("async", _, e):
-			return toCps(e, ignore(), ignore());
-		case EBreak if( currentBreak != null ):
-			return currentBreak(e);
-		case EContinue if( currentLoop != null ):
-			return block([retNull(currentLoop, e), mk(EReturn(),e)],e);
-		case EFor(_), EWhile(_):
-			var oldLoop = currentLoop, oldBreak = currentBreak;
-			currentLoop = null;
-			currentBreak = null;
-			e = Tools.map(e, buildSync.bind(_, exit));
-			currentLoop = oldLoop;
-			currentBreak = oldBreak;
-			return e;
-		case EReturn(eret) if( exit != null ):
-			return block([eret == null ? retNull(exit, e) : call(exit,[eret], e), mk(EReturn(),e)], e);
-		default:
-			return Tools.map(e, buildSync.bind(_, exit));
-		}
-	}
-
-	public function new() {
-		varNames = [];
-	}
-
-	function ignore(?e) : Expr {
-		var inf = e == null ? nullExpr : e;
-		return fun("_", block(e == null ? [] : [e],inf));
-	}
-
-	inline function ident(str, e) {
-		return mk(EIdent(str), e);
-	}
-
-	inline function fun(arg:String, e, ?name) {
-		return mk(EFunction([{ name : arg, t : null }], e, name), e);
-	}
-
-	inline function funs(arg:Array<String>, e, ?name) {
-		return mk(EFunction([for( a in arg ) { name : a, t : null }], e, name), e);
-	}
-
-	inline function block(arr:Array<Expr>, e) {
-		if( arr.length == 1 && expr(arr[0]).match(EBlock(_)) )
-			return arr[0];
-		return mk(EBlock(arr), e);
-	}
-
-	inline function field(e, f, inf) {
-		return mk(EField(e, f), inf);
-	}
-
-	inline function binop(op, e1, e2, inf) {
-		return mk(EBinop(op, e1, e2), inf);
-	}
-
-	inline function call(e, args, inf) {
-		return mk(ECall(e, args), inf);
-	}
-
-	function retNull(e:Expr,?pos) : Expr {
-		switch( expr(e) ) {
-		case EFunction([{name:"_"}], e, _, _): return e;
-		default:
-		}
-		return call(e, [nullId], pos == null ? e : pos);
-	}
-
-	function makeCall( ecall, args : Array<Expr>, rest : Expr, exit, sync = false ) {
-		var names = [for( i in 0...args.length ) "_a"+uid++];
-		var rargs = [for( i in 0...args.length ) ident(names[i],ecall)];
-		if( !sync )
-			rargs.unshift(rest);
-		var rest = mk(sync ? ECall(rest,[call(ecall, rargs,ecall)]) : ECall(ecall, rargs), ecall);
-		var i = args.length - 1;
-		while( i >= 0 ) {
-			rest = toCps(args[i], fun(names[i], rest), exit);
-			i--;
-		}
-		return rest;
-	}
-
-	var syncFlag : Bool;
-
-	function isSync( e : Expr ) {
-		syncFlag = true;
-		checkSync(e);
-		return syncFlag;
-	}
-
-	function checkSync( e : Expr ) {
-		if( !syncFlag )
-			return;
-		switch( expr(e) ) {
-		case ECall(_):
-			syncFlag = false;
-		case EFunction(_,_,name,_) if( name != null ):
-			syncFlag = false;
-		case EMeta("sync" | "async", _, _):
-			// isolated from the sync part
-		default:
-			Tools.iter(e, checkSync);
-		}
-	}
-
-	function saveVars() {
-		return varNames.length;
-	}
-
-	function restoreVars(k) {
-		while( varNames.length > k ) varNames.pop();
-	}
-
-	public function toCps( e : Expr, rest : Expr, exit : Expr ) : Expr {
-		if( isSync(e) )
-			return call(rest, [buildSync(e, exit)],e);
-		switch( expr(e) ) {
-		case EBlock(el):
-			var el = el.copy();
-			var vold = saveVars();
-			// local recursion
-			for( e in el )
-				switch( expr(e) ) {
-				case EFunction(_, _, name, null): if( name != null ) varNames.push(name);
-				default:
-				}
-			while( el.length > 0 ) {
-				var e = toCps(el.pop(), rest, exit);
-				rest = ignore(e);
-			}
-			restoreVars(vold);
-			return retNull(rest);
-		case EFunction(args, body, name, t):
-			var vold = saveVars();
-			if( name != null )
-				varNames.push(name);
-			for( a in args )
-				varNames.push(a.name);
-			args.unshift( { name : "_onEnd", t : null } );
-			var frest = ident("_onEnd",e);
-			var oldFun = currentFun;
-			currentFun = name;
-			var body = toCps(body, frest, frest);
-			var f = mk(EFunction(args, body, name, t),e);
-			restoreVars(vold);
-			return rest == null ? f : call(rest, [f],e);
-		case EParent(e):
-			return mk(EParent(toCps(e, rest, exit)),e);
-		case EMeta("sync", _, e):
-			return call(rest,[buildSync(e,exit)],e);
-		case EMeta("async", _, e):
-			var nothing = ignore();
-			return block([toCps(e,nothing,nothing),retNull(rest)],e);
-		case EMeta("split", _, e):
-			var args = switch( expr(e) ) { case EArrayDecl(el): el; default: throw "@split expression should be an array"; };
-			var args = [for( a in args ) fun("_rest", toCps(block([a],a), ident("_rest",a), exit))];
-			return call(ident("split",e), [rest, mk(EArrayDecl(args),e)],e);
-		case ECall(expr(_) => EIdent(i), args):
-			return makeCall( ident( varNames.indexOf(i) < 0 ? "a_" + i : i,e) , args, rest, exit);
-		case ECall(expr(_) => EField(e, f), args):
-			return makeCall(field(e,"a_"+f,e), args, rest, exit);
-		case EFor(v, eit, eloop):
-			var id = ++uid;
-			var it = ident("_i" + id,e);
-			var oldLoop = currentLoop, oldBreak = currentBreak;
-			var loop = ident("_loop" + id,e);
-			currentLoop = loop;
-			currentBreak = function(inf) return block([retNull(rest, inf), mk(EReturn(),inf)], inf);
-			var efor = block([
-				mk(EVar("_i" + id, call(ident("makeIterator",eit),[eit],eit)),eit),
-				fun("_", block([
-					mk(EIf(mk(EUnop("!", true, call( field(it, "hasNext", it), [], it)),it), currentBreak(it)),it),
-					mk(EVar(v, call(field(it, "next",it), [], it)), it),
-					toCps(eloop, loop, exit),
-				], it),"_loop" + id),
-				retNull(loop, e),
-			], e);
-			currentLoop = oldLoop;
-			currentBreak = oldBreak;
-			return efor;
-		case EUnop(op = "!", prefix, eop):
-			return toCps(eop, fun("_r",call(rest, [mk(EUnop(op, prefix, ident("_r",e)),e)], e)), exit);
-		case EBinop(op, e1, e2):
-			switch( op ) {
-			case "=", "+=", "-=", "/=", "*=", "%=", "&=", "|=", "^=":
-				switch( expr(e1) ) {
-				case EIdent(_):
-					var id = "_r" + uid++;
-					return toCps(e2, fun(id, call(rest, [binop(op, e1, ident(id,e1),e1)], e1)), exit);
-				case EField(ef1, f):
-					var id1 = "_r" + uid++;
-					var id2 = "_r" + uid++;
-					return toCps(ef1, fun(id1, toCps(e2, fun(id2, call(rest, [binop(op, field(ident(id1, e1), f, ef1), ident(id2, e2), e)], e)), exit)), exit);
-				case EArray(earr, eindex):
-					var idArr = "_r" + uid++;
-					var idIndex = "_r" + uid++;
-					var idVal = "_r" + uid++;
-					return toCps(earr,fun(idArr, toCps(eindex, fun(idIndex, toCps(e2,
-						fun(idVal, call(rest, [binop(op, mk(EArray(ident(idArr,earr), ident(idIndex,eindex)),e1), ident(idVal,e1), e)], e))
-					, exit)), exit)),exit);
-				default:
-					throw "assert " + e1;
-				}
-			case "||":
-				var id1 = "_r" + uid++;
-				var id2 = "_r" + uid++;
-				return toCps(e1, fun(id1, mk(EIf(binop("==", ident(id1,e1), ident("true",e1), e1),call(rest,[ident("true",e1)],e1),toCps(e2, rest, exit)),e)), exit);
-			case "&&":
-				var id1 = "_r" + uid++;
-				var id2 = "_r" + uid++;
-				return toCps(e1, fun(id1, mk(EIf(binop("!=", ident(id1,e1), ident("true",e1), e1),call(rest,[ident("false",e1)],e1),toCps(e2, rest, exit)),e)), exit);
-			default:
-				var id1 = "_r" + uid++;
-				var id2 = "_r" + uid++;
-				return toCps(e1, fun(id1, toCps(e2, fun(id2, call(rest, [binop(op, ident(id1,e1), ident(id2,e2), e)], e)), exit)), exit);
-			}
-		case EIf(cond, e1, e2), ETernary(cond, e1, e2):
-			return toCps(cond, fun("_c", mk(EIf(ident("_c",cond), toCps(e1, rest, exit), e2 == null ? retNull(rest) : toCps(e2, rest, exit)),e)), exit);
-		case EWhile(cond, ewh):
-			var id = ++uid;
-			var loop = ident("_loop" + id, cond);
-			var oldLoop = currentLoop, oldBreak = currentBreak;
-			currentLoop = loop;
-			currentBreak = function(e) return block([retNull(rest,e), mk(EReturn(),e)],e);
-			var ewhile = block([
-				fun("_r",
-					toCps(cond, fun("_c", mk(EIf(ident("_c", cond), toCps(ewh, loop, exit), retNull(rest,cond)),cond)), exit)
-				, "_loop"+id),
-				retNull(loop, cond),
-			],e);
-			currentLoop = oldLoop;
-			currentBreak = oldBreak;
-			return ewhile;
-		case EReturn(eret):
-			return eret == null ? retNull(exit, e) : toCps(eret, exit, exit);
-		case EObject(fields):
-			var id = "_o" + uid++;
-			var rest = call(rest, [ident(id,e)], e);
-			fields.reverse();
-			for( f in fields )
-				rest = toCps(f.e, fun("_r", block([
-					binop("=", mk(EField(ident(id,f.e), f.name),f.e), ident("_r",f.e), f.e),
-					rest,
-				],f.e)),exit);
-			return block([
-				mk(EVar(id, mk(EObject([]),e)),e),
-				rest,
-			],e);
-		case EArrayDecl(el):
-			var id = "_a" + uid++;
-			var rest = call(rest, [ident(id,e)], e);
-			var i = el.length - 1;
-			while( i >= 0 ) {
-				var e = el[i];
-				rest = toCps(e, fun("_r", block([
-					binop("=", mk(EArray(ident(id,e), mk(EConst(CInt(i)),e)),e), ident("_r",e), e),
-					rest,
-				],e)), exit);
-				i--;
-			}
-			return block([
-				mk(EVar(id, mk(EArrayDecl([]),e)),e),
-				rest,
-			],e);
-		case EArray(earr, eindex):
-			var id1 = "_r" + uid++;
-			var id2 = "_r" + uid++;
-			return toCps(earr, fun(id1, toCps(eindex, fun(id2, call(rest, [mk(EArray(ident(id1,e), ident(id2,e)),e)], e)), exit)), exit);
-		case EVar(v, t, ev):
-			if( ev == null )
-				return block([e, retNull(rest, e)], e);
-			return block([
-				mk(EVar(v, t),e),
-				toCps(ev, fun("_r", block([binop("=", ident(v,e), ident("_r",e), e), retNull(rest,e)], e)), exit),
-			],e);
-		case EConst(_), EIdent(_), EUnop(_), EField(_):
-			return call(rest, [e], e);
-		case ENew(cl, args):
-			var names = [for( i in 0...args.length ) "_a"+uid++];
-			var rargs = [for( i in 0...args.length ) ident(names[i], args[i])];
-			var rest = call(rest,[mk(ENew(cl, rargs),e)],e);
-			var i = args.length - 1;
-			while( i >= 0 ) {
-				rest = toCps(args[i], fun(names[i], rest), exit);
-				i--;
-			}
-			return rest;
-		case EBreak:
-			if( currentBreak == null ) throw "Break outside loop";
-			return currentBreak(e);
-		case EContinue:
-			if( currentLoop == null ) throw "Continue outside loop";
-			return block([retNull(currentLoop, e), mk(EReturn(),e)], e);
-		case ESwitch(v, cases, def):
-			var cases = [for( c in cases ) { values : c.values, expr : toCps(c.expr, rest, exit) } ];
-			return toCps(v, mk(EFunction([ { name : "_c", t : null } ], mk(ESwitch(ident("_c",v), cases, def == null ? retNull(rest) : toCps(def, rest, exit)),e)),e), exit );
-		case EThrow(v):
-			return toCps(v, mk(EFunction([ { name : "_v", t : null } ], mk(EThrow(v),v)), v), exit);
-		//case EDoWhile(_), ETry(_), ECall(_):
-		default:
-			throw "Unsupported async expression " + Printer.toString(e);
-		}
-	}
-
-}
-
-
-class AsyncInterp extends Interp {
-
-	public function setContext( api : Dynamic ) {
-
-		var funs = new Array();
-		for( v in variables.keys() )
-			if( Reflect.isFunction(variables.get(v)) )
-				funs.push({ v : v, obj : null });
-
-		variables.set("split", split);
-		variables.set("makeIterator", makeIterator);
-
-		var c = Type.getClass(api);
-		for( f in (c == null ? Reflect.fields(api) : Type.getInstanceFields(c)) ) {
-			var fv = Reflect.field(api, f);
-			if( !Reflect.isFunction(fv) ) continue;
-			if( f.charCodeAt(0) == "_".code ) f = f.substr(1);
-			variables.set(f, fv);
-			// create the async wrapper if doesn't exists
-			if( f.substr(0, 2) != "a_" )
-				funs.push({ v : f, obj : api });
-		}
-
-		for( v in funs ) {
-			if( variables.exists("a_" + v.v) ) continue;
-			var fv : Dynamic = variables.get(v.v);
-			var obj = v.obj;
-			variables.set("a_" + v.v, Reflect.makeVarArgs(function(args:Array<Dynamic>) {
-				var onEnd = args.shift();
-				onEnd(Reflect.callMethod(obj, fv, args));
-			}));
-		}
-	}
-
-	public function hasMethod( name : String ) {
-		var v = variables.get(name);
-		return v != null && Reflect.isFunction(v);
-	}
-
-	public function callValue( value : Dynamic, args : Array<Dynamic>, ?onResult : Dynamic -> Void, ?vthis : {} ) {
-		var oldThis = variables.get("this");
-		if( vthis != null )
-			variables.set("this", vthis);
-		if( onResult == null )
-			onResult = function(_) {};
-		args.unshift(onResult);
-		Reflect.callMethod(null, value, args);
-		variables.set("this", oldThis);
-	}
-
-	public function callAsync( id : String, args, ?onResult, ?vthis : {} ) {
-		var v = variables.get(id);
-		if( v == null )
-			throw "Missing function " + id + "()";
-		callValue(v, args, onResult, vthis);
-	}
-
-	function split( rest : Dynamic -> Void, args : Array<Dynamic> ) {
-		if( args.length == 0 )
-			rest(null);
-		else {
-			var count = args.length;
-			function next(_) {
-				if( --count == 0 ) rest(null);
-			}
-			for( a in args )
-				a(next);
-		}
-	}
-
-	override function fcall( o : Dynamic, f : String, args : Array<Dynamic> ) : Dynamic {
-		var m = Reflect.field(o, f);
-		if( m == null ) {
-			if( f.substr(0, 2) == "a_" ) {
-				m = Reflect.field(o, f.substr(2));
-				// fallback on sync version
-				if( m != null ) {
-					var onEnd = args.shift();
-					onEnd(call(o, m, args));
-					return null;
-				}
-				// fallback on generic script
-				m = Reflect.field(o, "scriptCall");
-				if( m != null ) {
-					call(o, m, [args.shift(), f.substr(2), args]);
-					return null;
-				}
-			} else {
-				// fallback on generic script
-				m = Reflect.field(o, "scriptCall");
-				if( m != null ) {
-					var result : Dynamic = null;
-					call(o, m, [function(r) result = r, f, args]);
-					return result;
-				}
-			}
-			error(ECustom(o + " has no method " + f));
-		}
-		return call(o, m, args);
-	}
-
-}

hscript/Bytes.hx

@@ -1,23 +1,26 @@
 /*
- * Copyright (C)2008-2017 Haxe Foundation
+ * Copyright (c) 2008, Nicolas Cannasse
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
  *
- * Permission is hereby granted, free of charge, to any person obtaining a
+ *   - Redistributions of source code must retain the above copyright
- * copy of this software and associated documentation files (the "Software"),
+ *     notice, this list of conditions and the following disclaimer.
- * to deal in the Software without restriction, including without limitation
+ *   - Redistributions in binary form must reproduce the above copyright
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ *     notice, this list of conditions and the following disclaimer in the
- * and/or sell copies of the Software, and to permit persons to whom the
+ *     documentation and/or other materials provided with the distribution.
- * Software is furnished to do so, subject to the following conditions:
  *
- * The above copyright notice and this permission notice shall be included in
+ * THIS SOFTWARE IS PROVIDED BY THE HAXE PROJECT CONTRIBUTORS "AS IS" AND ANY
- * all copies or substantial portions of the Software.
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * DISCLAIMED. IN NO EVENT SHALL THE HAXE PROJECT CONTRIBUTORS BE LIABLE FOR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * DEALINGS IN THE SOFTWARE.
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
  */
 package hscript;
 import hscript.Expr;
@@ -72,7 +75,10 @@ class Bytes {
 	}
 
 	function doEncodeInt(v: Int) {
-		bout.addInt32(v);
+		bout.addByte(v & 0xFF);
+		bout.addByte((v >> 8) & 0xFF);
+		bout.addByte((v >> 16) & 0xFF);
+		bout.addByte(v >>> 24);
 	}
 
 	function doEncodeConst( c : Const ) {
@@ -104,7 +110,7 @@ class Bytes {
 	}
 
 	function doDecodeInt() {
-		var i = bin.getInt32(pin);
+		var i = bin.get(pin) | (bin.get(pin+1) << 8) | (bin.get(pin+2) << 16) | (bin.get(pin+3) << 24);
 		pin += 4;
 		return i;
 	}
@@ -241,22 +247,11 @@ class Bytes {
 			}
 			bout.addByte(255);
 			if( def == null ) bout.addByte(255) else doEncode(def);
-		case EMeta(name,args,e):
-			doEncodeString(name);
-			bout.addByte(args == null ? 0 : args.length + 1);
-			if( args != null ) for( e in args ) doEncode(e);
-			doEncode(e);
-		case ECheckType(e,_):
-			doEncode(e);
 		}
 	}
 
 	function doDecode() : Expr {
 	#if hscriptPos
-		if (bin.get(pin) == 255) {
-			pin++;
-			return null;
-		}
 		var origin = doDecodeString();
 		var line = doDecodeInt();
 		return { e : _doDecode(), pmin : 0, pmax : 0, origin : origin, line : line };
@@ -371,13 +366,6 @@ class Bytes {
 		case 24:
 			var cond = doDecode();
 			EDoWhile(cond,doDecode());
-		case 25:
-			var name = doDecodeString();
-			var count = bin.get(pin++);
-			var args = count == 0 ? null : [for( i in 0...count - 1 ) doDecode()];
-			EMeta(name, args, doDecode());
-		case 26:
-			ECheckType(doDecode(), CTPath(["Void"]));
 		case 255:
 			null;
 		default:

hscript/Checker.hx

@@ -1,940 +0,0 @@
-package hscript;
-import hscript.Expr;
-
-/**
-	This is a special type that can be used in API.
-	It will be type-checked as `Script` but will compile/execute as `Real`
-**/
-typedef TypeCheck<Real,Script> = Real;
-
-enum TType {
-	TMono( r : { r : TType } );
-	TVoid;
-	TInt;
-	TFloat;
-	TBool;
-	TDynamic;
-	TParam( name : String );
-	TUnresolved( name : String );
-	TNull( t : TType );
-	TInst( c : CClass, args : Array<TType> );
-	TEnum( e : CEnum, args : Array<TType> );
-	TType( t : CTypedef, args : Array<TType> );
-	TAbstract( a : CAbstract, args : Array<TType> );
-	TFun( args : Array<{ name : String, opt : Bool, t : TType }>, ret : TType );
-	TAnon( fields : Array<{ name : String, opt : Bool, t : TType }> );
-}
-
-private enum WithType {
-	NoValue;
-	Value;
-	WithType( t : TType );
-}
-
-enum CTypedecl {
-	CTClass( c : CClass );
-	CTEnum( e : CEnum );
-	CTTypedef( t : CTypedef );
-	CTAlias( t : TType );
-	CTAbstract( a : CAbstract );
-}
-
-typedef CNamedType = {
-	var name : String;
-	var params : Array<TType>;
-}
-
-typedef CClass = {> CNamedType,
-	@:optional var superClass : TType;
-	@:optional var constructor : CField;
-	var fields : Map<String,CField>;
-	var statics : Map<String,CField>;
-}
-
-typedef CField = {
-	var isPublic : Bool;
-	var params : Array<TType>;
-	var name : String;
-	var t : TType;
-}
-
-typedef CEnum = {> CNamedType,
-	var constructors : Map<String,TType>;
-}
-
-typedef CTypedef = {> CNamedType,
-	var t : TType;
-}
-
-typedef CAbstract = {> CNamedType,
-}
-
-@:allow(hscript.Checker)
-class CheckerTypes {
-
-	var types : Map<String,CTypedecl> = new Map();
-	var t_string : TType;
-	var localParams : Map<String,TType>;
-
-	public function new() {
-		types = new Map();
-		types.set("Void",CTAlias(TVoid));
-		types.set("Int",CTAlias(TInt));
-		types.set("Float",CTAlias(TFloat));
-		types.set("Bool",CTAlias(TBool));
-		types.set("Dynamic",CTAlias(TDynamic));
-	}
-
-	public function addXmlApi( api : Xml ) {
-		var types = new haxe.rtti.XmlParser();
-		types.process(api, "");
-		var todo = [];
-		for( v in types.root )
-			addXmlType(v,todo);
-		for( f in todo )
-			f();
-		t_string = getType("String");
-	}
-
-	function addXmlType(x:haxe.rtti.CType.TypeTree,todo:Array<Void->Void>) {
-		switch (x) {
-		case TPackage(name, full, subs):
-			for( s in subs ) addXmlType(s,todo);
-		case TClassdecl(c):
-			if( types.exists(c.path) ) return;
-			var cl : CClass = {
-				name : c.path,
-				params : [],
-				fields : new Map(),
-				statics : new Map(),
-			};
-			for( p in c.params )
-				cl.params.push(TParam(p));
-			todo.push(function() {
-				localParams = [for( t in cl.params ) c.path+"."+Checker.typeStr(t) => t];
-				if( c.superClass != null )
-					cl.superClass = getType(c.superClass.path, [for( t in c.superClass.params ) makeXmlType(t)]);
-				var pkeys = [];
-				for( f in c.fields ) {
-					if( f.isOverride || f.name.substr(0,4) == "get_" || f.name.substr(0,4) == "set_" ) continue;
-					var skip = false;
-					for( m in f.meta )
-						if( m.name == ":noScript" ) {
-							skip = true;
-							break;
-						}
-					if( skip ) continue;
-					var fl : CField = { isPublic : f.isPublic, params : [], name : f.name, t : null };
-					for( p in f.params ) {
-						var pt = TParam(p);
-						var key = f.name+"."+p;
-						pkeys.push(key);
-						fl.params.push(pt);
-						localParams.set(key, pt);
-					}
-					fl.t = makeXmlType(f.type);
-					while( pkeys.length > 0 )
-						localParams.remove(pkeys.pop());
-					if( fl.name == "new" )
-						cl.constructor = fl;
-					else
-						cl.fields.set(f.name, fl);
-				}
-				localParams = null;
-			});
-			types.set(cl.name, CTClass(cl));
-		case TEnumdecl(e):
-			if( types.exists(e.path) ) return;
-			var en : CEnum = {
-				name : e.path,
-				params : [],
-				constructors: new Map(),
-			};
-			for( p in e.params )
-				en.params.push(TParam(p));
-			todo.push(function() {
-				localParams = [for( t in en.params ) e.path+"."+Checker.typeStr(t) => t];
-				localParams = null;
-			});
-			types.set(en.name, CTEnum(en));
-		case TTypedecl(t):
-			if( types.exists(t.path) ) return;
-			var td : CTypedef = {
-				name : t.path,
-				params : [],
-				t : null,
-			};
-			for( p in t.params )
-				td.params.push(TParam(p));
-			if( t.path == "hscript.TypeCheck" )
-				td.params.reverse();
-			todo.push(function() {
-				localParams = [for( pt in td.params ) t.path+"."+Checker.typeStr(pt) => pt];
-				td.t = makeXmlType(t.type);
-				localParams = null;
-			});
-			types.set(t.path, CTTypedef(td));
-		case TAbstractdecl(a):
-			if( types.exists(a.path) ) return;
-			var ta : CAbstract = {
-				name : a.path,
-				params : [],
-			};
-			for( p in a.params )
-				ta.params.push(TParam(p));
-			todo.push(function() {
-				localParams = [for( t in ta.params ) a.path+"."+Checker.typeStr(t) => t];
-				localParams = null;
-			});
-			types.set(a.path, CTAbstract(ta));
-		}
-	}
-
-	function makeXmlType( t : haxe.rtti.CType.CType ) : TType {
-		return switch (t) {
-		case CUnknown: TUnresolved("Unknown");
-		case CEnum(name, params): getType(name,[for( t in params ) makeXmlType(t)]);
-		case CClass(name, params): getType(name,[for( t in params ) makeXmlType(t)]);
-		case CTypedef(name, params): getType(name,[for( t in params ) makeXmlType(t)]);
-		case CFunction(args, ret): TFun([for( a in args ) { name : a.name, opt : a.opt, t : makeXmlType(a.t) }], makeXmlType(ret));
-		case CAnonymous(fields):
-			inline function isOpt(m:haxe.rtti.CType.MetaData) {
-				if( m == null ) return false;
-				var b = false;
-				for( m in m ) if( m.name == ":optional" ) { b = true; break; }
-				return b;
-			}
-			TAnon([for( f in fields ) { name : f.name, t : makeXmlType(f.type), opt : isOpt(f.meta) }]);
-		case CDynamic(t): TDynamic;
-		case CAbstract(name, params):
-			switch( name ) {
-			default:
-				getType(name,[for( t in params ) makeXmlType(t)]);
-			}
-		}
-	}
-
-	function getType( name : String, ?args : Array<TType> ) : TType {
-		if( localParams != null ) {
-			var t = localParams.get(name);
-			if( t != null ) return t;
-		}
-		var t = resolve(name,args);
-		if( t == null )
-			return TUnresolved(name); // most likely private class
-		return t;
-	}
-
-	public function resolve( name : String, ?args : Array<TType> ) : TType {
-		if( name == "Null" ) {
-			if( args == null || args.length != 1 ) throw "Missing Null<T> parameter";
-			return TNull(args[0]);
-		}
-		var t = types.get(name);
-		if( t == null ) return null;
-		if( args == null ) args = [];
-		return switch( t ) {
-		case CTClass(c): TInst(c,args);
-		case CTEnum(e): TEnum(e,args);
-		case CTTypedef(t): TType(t,args);
-		case CTAbstract(a): TAbstract(a, args);
-		case CTAlias(t): t;
-		}
-	}
-
-}
-
-class Checker {
-
-	public var types : CheckerTypes;
-	var locals : Map<String,TType>;
-	var globals : Map<String,TType> = new Map();
-	var events : Map<String,TType> = new Map();
-	public var allowAsync : Bool;
-	public var allowReturn : Null<TType>;
-
-	public function new( ?types ) {
-		if( types == null ) types = new CheckerTypes();
-		this.types = types;
-	}
-
-	public function setGlobal( name : String, type : TType ) {
-		globals.set(name, type);
-	}
-
-	public function setEvent( name : String, type : TType ) {
-		events.set(name, type);
-	}
-
-	public function getGlobals() {
-		return globals;
-	}
-
-	public function check( expr : Expr, ?withType : WithType ) {
-		if( withType == null ) withType = NoValue;
-		locals = new Map();
-		return typeExpr(expr,withType);
-	}
-
-	inline function edef( e : Expr ) {
-		#if hscriptPos
-		return e.e;
-		#else
-		return e;
-		#end
-	}
-
-	inline function error( msg : String, curExpr : Expr ) {
-		var e = ECustom(msg);
-		#if hscriptPos var e = new Error(e, curExpr.pmin, curExpr.pmax, curExpr.origin, curExpr.line); #end
-		throw e;
-	}
-
-	function saveLocals() {
-		return [for( k in locals.keys() ) k => locals.get(k)];
-	}
-
-	function makeType( t : CType, e : Expr ) : TType {
-		return switch (t) {
-		case CTPath(path, params):
-			var ct = types.resolve(path.join("."),params == null ? [] : [for( p in params ) makeType(t,e)]);
-			if( ct == null ) error("Unknown type "+path, e);
-			return ct;
-		case CTFun(args, ret):
-			var i = 0;
-			return TFun([for( a in args ) { name : "p"+(i++), opt : false, t : makeType(a,e) }], makeType(ret,e));
-		case CTAnon(fields):
-			return TAnon([for( f in fields ) { name : f.name, opt : false, t : makeType(f.t,e) }]);
-		case CTParent(t):
-			return makeType(t,e);
-		}
-	}
-
-	public static function typeStr( t : TType ) {
-		inline function makeArgs(args:Array<TType>) return args.length==0 ? "" : "<"+[for( t in args ) typeStr(t)].join(",")+">";
-		return switch (t) {
-		case TMono(r): r.r == null ? "Unknown" : typeStr(r.r);
-		case TInst(c, args): c.name + makeArgs(args);
-		case TEnum(e, args): e.name + makeArgs(args);
-		case TType(t, args): t.name + makeArgs(args);
-		case TAbstract(a, args): a.name + makeArgs(args);
-		case TFun(args, ret): "(" + [for( a in args ) (a.opt?"?":"")+(a.name == "" ? "" : a.name+":")+typeStr(a.t)].join(", ")+") -> "+typeStr(ret);
-		case TAnon(fields): "{" + [for( f in fields ) (f.opt?"?":"")+f.name+":"+typeStr(f.t)].join(", ")+"}";
-		case TParam(name): name;
-		case TNull(t): "Null<"+typeStr(t)+">";
-		case TUnresolved(name): "?"+name;
-		default: t.getName().substr(1);
-		}
-	}
-
-	function linkLoop( a : TType, t : TType ) {
-		if( t == a ) return true;
-		switch( t ) {
-		case TMono(r):
-			if( r.r == null ) return false;
-			return linkLoop(a,r.r);
-		case TEnum(_,tl), TInst(_,tl), TType(_,tl), TAbstract(_,tl):
-			for( t in tl )
-				if( linkLoop(a,t) )
-					return true;
-			return false;
-		case TFun(args,ret):
-			for( arg in args )
-				if( linkLoop(a,arg.t) )
-					return true;
-			return linkLoop(a,ret);
-		case TDynamic:
-			if( t == TDynamic )
-				return false;
-			return linkLoop(a,TDynamic);
-		case TAnon(fl):
-			for( f in fl )
-				if( linkLoop(a, f.t) )
-					return true;
-			return false;
-		default:
-			return false;
-		}
-	}
-
-	function link( a : TType, b : TType, r : { r : TType } ) {
-		if( linkLoop(a,b) )
-			return follow(b) == a;
-		if( b == TDynamic )
-			return true;
-		r.r = b;
-		return true;
-	}
-
-	function typeEq( t1 : TType, t2 : TType ) {
-		if( t1 == t2 )
-			return true;
-		switch( [t1,t2] ) {
-		case [TMono(r), _]:
-			if( r.r == null ) {
-				if( !link(t1,t2,r) )
-					return false;
-				r.r = t2;
-				return true;
-			}
-			return typeEq(r.r, t2);
-		case [_, TMono(r)]:
-			if( r.r == null ) {
-				if( !link(t2,t1,r) )
-					return false;
-				r.r = t1;
-				return true;
-			}
-			return typeEq(t1, r.r);
-		case [TType(t1,pl1),TType(t2,pl2)] if( t1 == t2 ):
-			for( i in 0...pl1.length )
-				if( !typeEq(pl1[i],pl2[i]) )
-					return false;
-			return true;
-		case [TType(t1,pl1), _]:
-			return typeEq(apply(t1.t, t1.params, pl1), t2);
-		case [_,TType(t2,pl2)]:
-			return typeEq(t1, apply(t2.t, t2.params, pl2));
-		case [TInst(cl1,pl1), TInst(cl2,pl2)] if( cl1 == cl2 ):
-			for( i in 0...pl1.length )
-				if( !typeEq(pl1[i],pl2[i]) )
-					return false;
-			return true;
-		case [TEnum(e1,pl1), TEnum(e2,pl2)] if( e1 == e2 ):
-			for( i in 0...pl1.length )
-				if( !typeEq(pl1[i],pl2[i]) )
-					return false;
-			return true;
-		case [TAbstract(a1,pl1), TAbstract(a2,pl2)] if( a1 == a2 ):
-			for( i in 0...pl1.length )
-				if( !typeEq(pl1[i],pl2[i]) )
-					return false;
-			return true;
-		case [TNull(t1), TNull(t2)]:
-			return typeEq(t1,t2);
-		case [TNull(t1), _]:
-			return typeEq(t1,t2);
-		case [_, TNull(t2)]:
-			return typeEq(t1,t2);
-		case [TFun(args1,r1), TFun(args2,r2)] if( args1.length == args2.length ):
-			for( i in 0...args1.length )
-				if( !typeEq(args1[i].t, args2[i].t) )
-					return false;
-			return typeEq(r1, r2);
-		case [TAnon(a1),TAnon(a2)] if( a1.length == a2.length ):
-			var m = new Map();
-			for( f in a2 )
-				m.set(f.name, f);
-			for( f1 in a1 ) {
-				var f2 = m.get(f1.name);
-				if( f2 == null ) return false;
-				if( !typeEq(f1.t,f2.t) )
-					return false;
-			}
-			return true;
-		default:
-		}
-		return false;
-	}
-
-	function tryUnify( t1 : TType, t2 : TType ) {
-		if( t1 == t2 )
-			return true;
-		switch( [t1,t2] ) {
-		case [TMono(r), _]:
-			if( r.r == null ) {
-				if( !link(t1,t2,r) )
-					return false;
-				r.r = t2;
-				return true;
-			}
-			return tryUnify(r.r, t2);
-		case [_, TMono(r)]:
-			if( r.r == null ) {
-				if( !link(t2,t1,r) )
-					return false;
-				r.r = t1;
-				return true;
-			}
-			return tryUnify(t1, r.r);
-		case [TType(t1,pl1), _]:
-			return tryUnify(apply(t1.t, t1.params, pl1), t2);
-		case [_,TType(t2,pl2)]:
-			return tryUnify(t1, apply(t2.t, t2.params, pl2));
-		case [TNull(t1), _]:
-			return tryUnify(t1,t2);
-		case [_, TNull(t2)]:
-			return tryUnify(t1,t2);
-		case [TFun(args1,r1),TFun(args2,r2)] if( args1.length == args2.length ):
-			for( i in 0...args1.length ) {
-				var a1 = args1[i];
-				var a2 = args2[i];
-				if( a2.opt && !a1.opt ) return false;
-				if( !tryUnify(a2.t, a1.t) ) return false;
-			}
-			return tryUnify(r1,r2);
-		case [_, TDynamic]:
-			return true;
-		case [TDynamic, _]:
-			return true;
-		case [TAnon(a1),TAnon(a2)]:
-			var m = new Map();
-			for( f in a1 )
-				m.set(f.name, f);
-			for( f2 in a2 ) {
-				var f1 = m.get(f2.name);
-				if( f1 == null ) {
-					if( f2.opt ) continue;
-					return false;
-				}
-				if( !typeEq(f1.t,f2.t) )
-					return false;
-			}
-			return true;
-		case [TInst(cl1,pl1), TInst(cl2,pl2)]:
-			while( cl1 != cl2 ) {
-				switch( cl1.superClass ) {
-				case null: return false;
-				case TInst(c, args):
-					pl1 = [for( a in args ) apply(a,cl1.params,pl1)];
-					cl1 = c;
-				default: throw "assert";
-				}
-			}
-			for( i in 0...pl1.length )
-				if( !typeEq(pl1[i],pl2[i]) )
-					return false;
-			return true;
-		case [TInt, TFloat]:
-			return true;
-		case [TFun(_), TAbstract({ name : "haxe.Function" },_)]:
-			return true;
-		default:
-		}
-		return typeEq(t1,t2);
-	}
-
-	function unify( t1 : TType, t2 : TType, e : Expr ) {
-		if( !tryUnify(t1,t2) )
-			error(typeStr(t1)+" should be "+typeStr(t2),e);
-	}
-
-	function apply( t : TType, params : Array<TType>, args : Array<TType> ) {
-		if( args.length != params.length ) throw "Invalid number of type parameters";
-		if( args.length == 0 )
-			return t;
-		var subst = new Map();
-		for( i in 0...params.length )
-			subst.set(params[i], args[i]);
-		function map(t:TType) {
-			var st = subst.get(t);
-			if( st != null ) return st;
-			return mapType(t,map);
-		}
-		return map(t);
-	}
-
-	public function mapType( t : TType, f : TType -> TType ) {
-		switch (t) {
-		case TMono(r):
-			if( r.r == null ) return t;
-			return f(t);
-		case TVoid, TInt, TFloat,TBool,TDynamic,TParam(_), TUnresolved(_):
-			return t;
-		case TEnum(_,[]), TInst(_,[]), TAbstract(_,[]), TType(_,[]):
-			return t;
-		case TNull(t):
-			return TNull(f(t));
-		case TInst(c, args):
-			return TInst(c, [for( t in args ) f(t)]);
-		case TEnum(e, args):
-			return TEnum(e, [for( t in args ) f(t)]);
-		case TType(t, args):
-			return TType(t, [for( t in args ) f(t)]);
-		case TAbstract(a, args):
-			return TAbstract(a, [for( t in args ) f(t)]);
-		case TFun(args, ret):
-			return TFun([for( a in args ) { name : a.name, opt : a.opt, t : f(a.t) }], f(ret));
-		case TAnon(fields):
-			return TAnon([for( af in fields ) { name : af.name, opt : af.opt, t : f(af.t) }]);
-		}
-	}
-
-	public function follow( t : TType ) {
-		return switch( t ) {
-		case TMono(r): if( r.r != null ) follow(r.r) else t;
-		case TType(t,args): apply(t.t, t.params, args);
-		case TNull(t): follow(t);
-		default: t;
-		}
-	}
-
-	public function getFields( t : TType ) {
-		var fields = [];
-		while( t != null ) {
-			t = follow(t);
-			switch( t ) {
-			case TInst(c, args):
-				for( fname in c.fields.keys() ) {
-					var f = c.fields.get(fname);
-					fields.push({ name : f.name, t : f.t });
-				}
-				t = c.superClass;
-			case TAnon(fl):
-				for( f in fl )
-					fields.push({ name : f.name, t : f.t });
-				break;
-			default:
-			}
-		}
-		return fields;
-	}
-
-	function getField( t : TType, f : String, e : Expr ) {
-		switch( follow(t) ) {
-		case TInst(c, args):
-			var cf = c.fields.get(f);
-			if( cf == null && allowAsync ) {
-				cf = c.fields.get("a_"+f);
-				if( cf != null ) {
-					var isPublic = true; // consider a_ prefixed as script specific
-					cf = { isPublic : isPublic, params : cf.params, name : cf.name, t : unasync(cf.t) };
-					if( cf.t == null ) cf = null;
-				}
-			}
-			if( cf == null ) {
-				if( c.superClass == null ) return null;
-				var ft = getField(c.superClass, f, e);
-				if( ft != null ) ft = apply(ft, c.params, args);
-				return ft;
-			}
-			if( !cf.isPublic )
-				error("Can't access private field "+f+" on "+c.name, e);
-			return apply(cf.t, c.params, args);
-		case TDynamic:
-			return makeMono();
-		case TAnon(fields):
-			for( af in fields )
-				if( af.name == f )
-					return af.t;
-			return null;
-		default:
-			return null;
-		}
-	}
-
-	public function unasync( t : TType ) : TType {
-		switch( follow(t) ) {
-		case TFun(args, ret) if( args.length > 0 ):
-			var rargs = args.copy();
-			switch( follow(rargs.shift().t) ) {
-			case TFun([r],_): return TFun(rargs,r.t);
-			default:
-			}
-		default:
-		}
-		return null;
-	}
-
-	function typeExprWith( expr : Expr, t : TType ) {
-		var et = typeExpr(expr, WithType(t));
-		unify(et, t, expr);
-		return t;
-	}
-
-	function makeMono() {
-		return TMono({r:null});
-	}
-
-	function makeIterator(t) : TType {
-		return TAnon([{ name : "next", opt : false, t : TFun([],t) }, { name : "hasNext", opt : false, t : TFun([],TBool) }]);
-	}
-
-	function mk(e,p) : Expr {
-		#if hscriptPos
-		return { e : e, pmin : p.pmin, pmax : p.pmax, origin : p.origin, line : p.line };
-		#else
-		return e;
-		#end
-	}
-
-	function isString( t : TType ) {
-		t = follow(t);
-		return t.match(TInst({name:"String"},_));
-	}
-
-	function typeExpr( expr : Expr, withType : WithType ) : TType {
-		switch( edef(expr) ) {
-		case EConst(c):
-			return switch (c) {
-			case CInt(_): TInt;
-			case CFloat(_): TFloat;
-			case CString(_): types.t_string;
-			}
-		case EIdent(v):
-			var l = locals.get(v);
-			if( l != null ) return l;
-			var g = globals.get(v);
-			if( g != null ) return g;
-			if( allowAsync ) {
-				g = globals.get("a_"+v);
-				if( g != null ) g = unasync(g);
-				if( g != null ) return g;
-			}
-			switch( v ) {
-			case "null":
-				return makeMono();
-			case "true", "false":
-				return TBool;
-			case "trace":
-				return TDynamic;
-			default:
-				error("Unknown identifier "+v, expr);
-			}
-		case EBlock(el):
-			var t = TVoid;
-			var locals = saveLocals();
-			for( e in el )
-				t = typeExpr(e, e == el[el.length-1] ? withType : NoValue);
-			this.locals = locals;
-			return t;
-		case EVar(n, t, init):
-			var vt = t == null ? makeMono() : makeType(t, expr);
-			if( init != null ) {
-				var et = typeExpr(init, t == null ? Value : WithType(vt));
-				if( t == null ) vt = et else unify(et,vt, init);
-			}
-			locals.set(n, vt);
-			return TVoid;
-		case EParent(e):
-			return typeExpr(e,withType);
-		case ECall(e, params):
-			var ft = typeExpr(e, Value);
-			switch( follow(ft) ) {
-			case TFun(args, ret):
-				for( i in 0...params.length ) {
-					var a = args[i];
-					if( a == null ) error("Too many arguments", params[i]);
-					var t = typeExpr(params[i], WithType(a.t));
-					unify(t, a.t, params[i]);
-				}
-				for( i in params.length...args.length )
-					if( !args[i].opt )
-						error("Missing argument '"+args[i].name+"'", expr);
-				return ret;
-			case TDynamic:
-				for( p in params ) typeExpr(p,Value);
-				return TDynamic;
-			default:
-				error(typeStr(ft)+" cannot be called", e);
-			}
-		case EField(o, f):
-			var ot = typeExpr(o, Value);
-			var ft = getField(ot, f, expr);
-			if( ft == null )
-				error(typeStr(ot)+" has no field "+f, expr);
-			return ft;
-		case ECheckType(v, t):
-			var ct = makeType(t, expr);
-			var vt = typeExpr(v, WithType(ct));
-			unify(vt, ct, v);
-			return ct;
-		case EMeta(_, _, e):
-			return typeExpr(e, withType);
-		case EIf(cond, e1, e2), ETernary(cond, e1, e2):
-			typeExprWith(cond, TBool);
-			var t1 = typeExpr(e1, withType);
-			if( e2 == null )
-				return t1;
-			var t2 = typeExpr(e2, withType);
-			if( withType == NoValue )
-				return TVoid;
-			if( tryUnify(t2,t1) )
-				return t1;
-			if( tryUnify(t1,t2) )
-				return t2;
-			unify(t2,t1,e2); // error
-		case EWhile(cond, e), EDoWhile(cond, e):
-			typeExprWith(cond,TBool);
-			typeExpr(e, NoValue);
-			return TVoid;
-		case EObject(fl):
-			switch( withType ) {
-			case WithType(follow(_) => TAnon(tfields)):
-				var map = [for( f in tfields ) f.name => f];
-				return TAnon([for( f in fl ) {
-					var ft = map.get(f.name);
-					if( ft == null ) error("Extra field "+f.name, f.e);
-					{ t : typeExprWith(f.e, ft.t), opt : false, name : f.name }
-				}]);
-			default:
-				return TAnon([for( f in fl ) { t : typeExpr(f.e, Value), opt : false, name : f.name }]);
-			}
-		case EBreak, EContinue:
-			return TVoid;
-		case EReturn(v):
-			var et = v == null ? TVoid : typeExpr(v, allowReturn == null ? Value : WithType(allowReturn));
-			if( allowReturn == null )
-				error("Return not allowed here", expr);
-			else
-				unify(et, allowReturn, v == null ? expr : v);
-			return TDynamic;
-		case EArrayDecl(el):
-			var et = null;
-			for( v in el ) {
-				var t = typeExpr(v, et == null ? Value : WithType(et));
-				if( et == null ) et = t else if( !tryUnify(t,et) ) {
-					if( tryUnify(et,t) ) et = t else unify(t,et,v);
-				}
-			}
-			if( et == null ) et = TDynamic;
-			return types.getType("Array",[et]);
-		case EArray(a, index):
-			typeExprWith(index, TInt);
-			var at = typeExpr(a, Value);
-			switch( follow(at) ) {
-			case TInst({ name : "Array"},[et]): return et;
-			default: error(typeStr(at)+" is not an Array", a);
-			}
-		case EThrow(e):
-			typeExpr(e, Value);
-			return TDynamic;
-		case EFunction(args, body, name, ret):
-			var tret = ret == null ? makeMono() : makeType(ret, expr);
-			var locals = saveLocals();
-			var oldRet = allowReturn;
-			allowReturn = tret;
-			var withArgs = null;
-			if( name != null && !withType.match(WithType(follow(_) => TFun(_))) ) {
-				var ev = events.get(name);
-				if( ev != null ) withType = WithType(ev);
-			}
-			switch( withType ) {
-			case WithType(follow(_) => TFun(args,ret)): withArgs = args; unify(tret,ret,expr);
-			default:
-			}
-			var targs = [for( i in 0...args.length ) {
-				var a = args[i];
-				var at = a.t == null ? makeMono() : makeType(a.t, expr);
-				if( withArgs != null && withArgs.length > i )
-					unify(withArgs[i].t, at, expr);
-				this.locals.set(a.name, at);
-				{ name : a.name, opt : a.opt, t : at };
-			}];
-
-			typeExpr(body,NoValue);
-			allowReturn = oldRet;
-			this.locals = locals;
-			var ft = TFun(targs,tret);
-			if( name != null )
-				locals.set(name, ft);
-			return ft;
-		case EUnop(op, _, e):
-			var et = typeExpr(e, Value);
-			switch( op ) {
-			case "++", "--":
-				unify(et,TInt,e);
-				return et;
-			case "!":
-				unify(et,TBool,e);
-				return et;
-			default:
-			}
-		case EFor(v, it, e):
-			var locals = saveLocals();
-			var itt = typeExpr(it, Value);
-			var vt = switch( follow(itt) ) {
-			case TInst({name:"Array"},[t]):
-				t;
-			default:
-				var t = makeMono();
-				var iter = makeIterator(t);
-				unify(itt,iter,it);
-				t;
-			}
-			this.locals.set(v, vt);
-			typeExpr(e, Value);
-			this.locals = locals;
-			return TVoid;
-		case EBinop(op, e1, e2):
-			switch( op ) {
-			case "&", "|", "^", ">>", ">>>", "<<":
-				typeExprWith(e1,TInt);
-				typeExprWith(e2,TInt);
-				return TInt;
-			case "=":
-				var vt = typeExpr(e1, Value);
-				typeExprWith(e2,vt);
-				return vt;
-			case "+":
-				var t1 = typeExpr(e1,WithType(TInt));
-				var t2 = typeExpr(e2,WithType(t1));
-				tryUnify(t1,t2);
-				switch( [follow(t1), follow(t2)]) {
-				case [TInt, TInt]:
-					return TInt;
-				case [TFloat, TInt], [TInt, TFloat], [TFloat, TFloat]:
-					return TFloat;
-				case [TDynamic, _], [_, TDynamic]:
-					return TDynamic;
-				case [t1,t2]:
-					if( isString(t1) || isString(t2) )
-						return types.t_string;
-					unify(t1, TFloat, e1);
-					unify(t2, TFloat, e2);
-				}
-			case "-", "*", "/", "%":
-				var t1 = typeExpr(e1,WithType(TInt));
-				var t2 = typeExpr(e2,WithType(t1));
-				if( !tryUnify(t1,t2) )
-					unify(t2,t1,e2);
-				switch( [follow(t1), follow(t2)]) {
-				case [TInt, TInt]:
-					if( op == "/" ) return TFloat;
-					return TInt;
-				case [TFloat|TDynamic, TInt|TDynamic], [TInt|TDynamic, TFloat|TDynamic], [TFloat, TFloat]:
-					return TFloat;
-				default:
-					unify(t1, TFloat, e1);
-					unify(t2, TFloat, e2);
-				}
-			case "&&", "||":
-				typeExprWith(e1,TBool);
-				typeExprWith(e2,TBool);
-				return TBool;
-			case "...":
-				typeExprWith(e1,TInt);
-				typeExprWith(e2,TInt);
-				return makeIterator(TInt);
-			case "==", "!=":
-				var t1 = typeExpr(e1,Value);
-				var t2 = typeExpr(e2,WithType(t1));
-				if( !tryUnify(t1,t2) )
-					unify(t2,t1,e2);
-				return TBool;
-			case ">", "<", ">=", "<=":
-				var t1 = typeExpr(e1,Value);
-				var t2 = typeExpr(e2,WithType(t1));
-				if( !tryUnify(t1,t2) )
-					unify(t2,t1,e2);
-				switch( follow(t1) ) {
-				case TInt, TFloat, TBool, TInst({name:"String"},_):
-				default:
-					error("Cannot compare "+typeStr(t1), expr);
-				}
-				return TBool;
-			default:
-				if( op.charCodeAt(op.length-1) == "=".code ) {
-					var t = typeExpr(mk(EBinop(op.substr(0,op.length-1),e1,e2),expr),withType);
-					return typeExpr(mk(EBinop("=",e1,e2),expr), withType);
-				}
-				error("Unsupported operation "+op, expr);
-			}
-		case ENew(cl, params):
-		case ETry(e, v, t, ecatch):
-		case ESwitch(e, cases, defaultExpr):
-		}
-		error("Don't know how to type "+edef(expr).getName(), expr);
-	}
-
-}

hscript/Expr.hx

@@ -1,23 +1,26 @@
 /*
- * Copyright (C)2008-2017 Haxe Foundation
+ * Copyright (c) 2008, Nicolas Cannasse
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
  *
- * Permission is hereby granted, free of charge, to any person obtaining a
+ *   - Redistributions of source code must retain the above copyright
- * copy of this software and associated documentation files (the "Software"),
+ *     notice, this list of conditions and the following disclaimer.
- * to deal in the Software without restriction, including without limitation
+ *   - Redistributions in binary form must reproduce the above copyright
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ *     notice, this list of conditions and the following disclaimer in the
- * and/or sell copies of the Software, and to permit persons to whom the
+ *     documentation and/or other materials provided with the distribution.
- * Software is furnished to do so, subject to the following conditions:
  *
- * The above copyright notice and this permission notice shall be included in
+ * THIS SOFTWARE IS PROVIDED BY THE HAXE PROJECT CONTRIBUTORS "AS IS" AND ANY
- * all copies or substantial portions of the Software.
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * DISCLAIMED. IN NO EVENT SHALL THE HAXE PROJECT CONTRIBUTORS BE LIABLE FOR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * DEALINGS IN THE SOFTWARE.
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
  */
 package hscript;
 
@@ -40,7 +43,6 @@ typedef Expr = {
 }
 enum ExprDef {
 #else
-typedef ExprDef = Expr;
 enum Expr {
 #end
 	EConst( c : Const );
@@ -68,21 +70,15 @@ enum Expr {
 	ETernary( cond : Expr, e1 : Expr, e2 : Expr );
 	ESwitch( e : Expr, cases : Array<{ values : Array<Expr>, expr : Expr }>, ?defaultExpr : Expr);
 	EDoWhile( cond : Expr, e : Expr);
-	EMeta( name : String, args : Array<Expr>, e : Expr );
-	ECheckType( e : Expr, t : CType );
 }
 
-typedef Argument = { name : String, ?t : CType, ?opt : Bool, ?value : Expr };
+typedef Argument = { name : String, ?t : CType, ?opt : Bool };
-
-typedef Metadata = Array<{ name : String, params : Array<Expr> }>;
 
 enum CType {
 	CTPath( path : Array<String>, ?params : Array<CType> );
 	CTFun( args : Array<CType>, ret : CType );
-	CTAnon( fields : Array<{ name : String, t : CType, ?meta : Metadata }> );
+	CTAnon( fields : Array<{ name : String, t : CType }> );
 	CTParent( t : CType );
-	CTOpt( t : CType );
-	CTNamed( n : String, t : CType );
 }
 
 #if hscriptPos
@@ -99,8 +95,39 @@ class Error {
 		this.origin = origin;
 		this.line = line;
 	}
+
+	private function errorDefToString(): String {
+		switch (e) {
+			case EInvalidChar(c):
+				return "Invalid character: '"+c+"'";
+
+			case EUnexpected(s):
+				return "Unexpected token: \""+s+"\"";
+
+			case EUnterminatedString:
+				return "Unterminated string";
+
+			case EUnterminatedComment:
+				return "Unterminated comment";
+
+			case EUnknownVariable(v):
+				return "Unknown variable: "+v;
+
+			case EInvalidIterator(v):
+				return "Invalid iterator: "+v;
+
+			case EInvalidOp(op):
+				return "Invalid operator: "+op;
+
+			case EInvalidAccess(f):
+				return "Invalid access to field "+f;
+		}
+	}
+
 	public function toString(): String {
-		return Printer.errorToString(this);
+		var message = errorDefToString();
+		message = origin + ":" + line + ": " + message;
+		return message;
 	}
 }
 enum ErrorDef {
@@ -111,70 +138,8 @@ enum Error {
 	EUnexpected( s : String );
 	EUnterminatedString;
 	EUnterminatedComment;
-	EInvalidPreprocessor( msg : String );
 	EUnknownVariable( v : String );
 	EInvalidIterator( v : String );
 	EInvalidOp( op : String );
 	EInvalidAccess( f : String );
-	ECustom( msg : String );
-}
-
-
-enum ModuleDecl {
-	DPackage( path : Array<String> );
-	DImport( path : Array<String>, ?everything : Bool );
-	DClass( c : ClassDecl );
-	DTypedef( c : TypeDecl );
-}
-
-typedef ModuleType = {
-	var name : String;
-	var params : {}; // TODO : not yet parsed
-	var meta : Metadata;
-	var isPrivate : Bool;
-}
-
-typedef ClassDecl = {> ModuleType,
-	var extend : Null<CType>;
-	var implement : Array<CType>;
-	var fields : Array<FieldDecl>;
-	var isExtern : Bool;
-}
-
-typedef TypeDecl = {> ModuleType,
-	var t : CType;
-}
-
-typedef FieldDecl = {
-	var name : String;
-	var meta : Metadata;
-	var kind : FieldKind;
-	var access : Array<FieldAccess>;
-}
-
-enum FieldAccess {
-	APublic;
-	APrivate;
-	AInline;
-	AOverride;
-	AStatic;
-	AMacro;
-}
-
-enum FieldKind {
-	KFunction( f : FunctionDecl );
-	KVar( v : VarDecl );
-}
-
-typedef FunctionDecl = {
-	var args : Array<Argument>;
-	var expr : Expr;
-	var ret : Null<CType>;
-}
-
-typedef VarDecl = {
-	var get : Null<String>;
-	var set : Null<String>;
-	var expr : Null<Expr>;
-	var type : Null<CType>;
 }

hscript/Interp.hx

@@ -1,23 +1,26 @@
 /*
- * Copyright (C)2008-2017 Haxe Foundation
+ * Copyright (c) 2008, Nicolas Cannasse
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
  *
- * Permission is hereby granted, free of charge, to any person obtaining a
+ *   - Redistributions of source code must retain the above copyright
- * copy of this software and associated documentation files (the "Software"),
+ *     notice, this list of conditions and the following disclaimer.
- * to deal in the Software without restriction, including without limitation
+ *   - Redistributions in binary form must reproduce the above copyright
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ *     notice, this list of conditions and the following disclaimer in the
- * and/or sell copies of the Software, and to permit persons to whom the
+ *     documentation and/or other materials provided with the distribution.
- * Software is furnished to do so, subject to the following conditions:
  *
- * The above copyright notice and this permission notice shall be included in
+ * THIS SOFTWARE IS PROVIDED BY THE HAXE PROJECT CONTRIBUTORS "AS IS" AND ANY
- * all copies or substantial portions of the Software.
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * DISCLAIMED. IN NO EVENT SHALL THE HAXE PROJECT CONTRIBUTORS BE LIABLE FOR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * DEALINGS IN THE SOFTWARE.
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
  */
 package hscript;
 import haxe.PosInfos;
@@ -26,7 +29,7 @@ import hscript.Expr;
 private enum Stop {
 	SBreak;
 	SContinue;
-	SReturn;
+	SReturn( v : Dynamic );
 }
 
 class Interp {
@@ -44,7 +47,6 @@ class Interp {
 	var depth : Int;
 	var inTry : Bool;
 	var declared : Array<{ n : String, old : { r : Dynamic } }>;
-	var returnValue : Dynamic;
 
 	#if hscriptPos
 	var curExpr : Expr;
@@ -62,12 +64,7 @@ class Interp {
 		variables.set("null",null);
 		variables.set("true",true);
 		variables.set("false",false);
-		variables.set("trace", Reflect.makeVarArgs(function(el) {
+		variables.set("trace",function(e) haxe.Log.trace(Std.string(e), posInfos()));
-			var inf = posInfos();
-			var v = el.shift();
-			if( el.length > 0 ) inf.customParams = el;
-			haxe.Log.trace(Std.string(v), inf);
-		}));
 		initOps();
 	}
 
@@ -122,7 +119,7 @@ class Interp {
 
 	function assign( e1 : Expr, e2 : Expr ) : Dynamic {
 		var v = expr(e2);
-		switch( Tools.expr(e1) ) {
+		switch( edef(e1) ) {
 		case EIdent(id):
 			var l = locals.get(id);
 			if( l == null )
@@ -154,7 +151,7 @@ class Interp {
 
 	function evalAssignOp(op,fop,e1,e2) : Dynamic {
 		var v;
-		switch( Tools.expr(e1) ) {
+		switch( edef(e1) ) {
 		case EIdent(id):
 			var l = locals.get(id);
 			v = fop(expr(e1),expr(e2));
@@ -253,10 +250,7 @@ class Interp {
 			switch( e ) {
 			case SBreak: throw "Invalid break";
 			case SContinue: throw "Invalid continue";
-			case SReturn:
+			case SReturn(v): return v;
-				var v = returnValue;
-				returnValue = null;
-				return v;
 			}
 		}
 		return null;
@@ -280,18 +274,21 @@ class Interp {
 		}
 	}
 
-	inline function error(e : #if hscriptPos ErrorDef #else Error #end, rethrow=false ) : Dynamic {
+	inline function edef( e : Expr ) {
-		#if hscriptPos var e = new Error(e, curExpr.pmin, curExpr.pmax, curExpr.origin, curExpr.line); #end
+		#if hscriptPos
-		if( rethrow ) this.rethrow(e) else throw e;
+		return e.e;
-		return null;
+		#else
+		return e;
+		#end
 	}
 
-	inline function rethrow( e : Dynamic ) {
+	inline function error(e : #if hscriptPos ErrorDef #else Error #end ) : Dynamic {
-		#if hl
+		#if hscriptPos
-		hl.Api.rethrow(e);
+		throw new Error(e, curExpr.pmin, curExpr.pmax, curExpr.origin, curExpr.line);
 		#else
 		throw e;
 		#end
+		return null;
 	}
 
 	function resolve( id : String ) : Dynamic {
@@ -364,7 +361,7 @@ class Interp {
 			for( p in params )
 				args.push(expr(p));
 
-			switch( Tools.expr(e) ) {
+			switch( edef(e) ) {
 			case EField(e,f):
 				var obj = expr(e);
 				if( obj == null ) error(EInvalidAccess(f));
@@ -388,8 +385,7 @@ class Interp {
 		case EContinue:
 			throw SContinue;
 		case EReturn(e):
-			returnValue = e == null ? null : expr(e);
+			throw SReturn((e == null)?null:expr(e));
-			throw SReturn;
 		case EFunction(params,fexpr,name,_):
 			var capturedLocals = duplicate(locals);
 			var me = this;
@@ -460,7 +456,7 @@ class Interp {
 			}
 			return f;
 		case EArrayDecl(arr):
-			if (arr.length > 0 && Tools.expr(arr[0]).match(EBinop("=>", _))) {
+			if (arr.length > 0 && edef(arr[0]).match(EBinop("=>", _))) {
 				var isAllString:Bool = true;
 				var isAllInt:Bool = true;
 				var isAllObject:Bool = true;
@@ -468,7 +464,7 @@ class Interp {
 				var keys:Array<Dynamic> = [];
 				var values:Array<Dynamic> = [];
 				for (e in arr) {
-					switch(Tools.expr(e)) {
+					switch(edef(e)) {
 						case EBinop("=>", eKey, eValue): {
 							var key:Dynamic = expr(eKey);
 							var value:Dynamic = expr(eValue);
@@ -564,10 +560,6 @@ class Interp {
 			if( !match )
 				val = def == null ? null : expr(def);
 			return val;
-		case EMeta(_, _, e):
-			return expr(e);
-		case ECheckType(e,_):
-			return expr(e);
 		}
 		return null;
 	}
@@ -581,7 +573,7 @@ class Interp {
 				switch(err) {
 				case SContinue:
 				case SBreak: break;
-				case SReturn: throw err;
+				case SReturn(_): throw err;
 				}
 			}
 		}
@@ -598,7 +590,7 @@ class Interp {
 				switch(err) {
 				case SContinue:
 				case SBreak: break;
-				case SReturn: throw err;
+				case SReturn(_): throw err;
 				}
 			}
 		}
@@ -606,7 +598,7 @@ class Interp {
 	}
 
 	function makeIterator( v : Dynamic ) : Iterator<Dynamic> {
-		#if ((flash && !flash9) || (php && !php7 && haxe_ver < '4.0.0'))
+		#if ((flash && !flash9) || php)
 		if ( v.iterator != null ) v = v.iterator();
 		#else
 		try v = v.iterator() catch( e : Dynamic ) {};
@@ -627,7 +619,7 @@ class Interp {
 				switch( err ) {
 				case SContinue:
 				case SBreak: break;
-				case SReturn: throw err;
+				case SReturn(_): throw err;
 				}
 			}
 		}

hscript/Macro.hx

@@ -1,23 +1,26 @@
 /*
- * Copyright (C)2008-2017 Haxe Foundation
+ * Copyright (c) 2011, Nicolas Cannasse
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
  *
- * Permission is hereby granted, free of charge, to any person obtaining a
+ *   - Redistributions of source code must retain the above copyright
- * copy of this software and associated documentation files (the "Software"),
+ *     notice, this list of conditions and the following disclaimer.
- * to deal in the Software without restriction, including without limitation
+ *   - Redistributions in binary form must reproduce the above copyright
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ *     notice, this list of conditions and the following disclaimer in the
- * and/or sell copies of the Software, and to permit persons to whom the
+ *     documentation and/or other materials provided with the distribution.
- * Software is furnished to do so, subject to the following conditions:
  *
- * The above copyright notice and this permission notice shall be included in
+ * THIS SOFTWARE IS PROVIDED BY THE HAXE PROJECT CONTRIBUTORS "AS IS" AND ANY
- * all copies or substantial portions of the Software.
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * DISCLAIMED. IN NO EVENT SHALL THE HAXE PROJECT CONTRIBUTORS BE LIABLE FOR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * DEALINGS IN THE SOFTWARE.
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
  */
 package hscript;
 import hscript.Expr.Error;
@@ -76,9 +79,6 @@ class Macro {
 			#if haxe3
 			case OpArrow: "=>";
 			#end
-			#if (haxe_ver >= 4)
-			case OpIn: "in";
-			#end
 			};
 			binops.set(str, op);
 			if( assign )
@@ -113,7 +113,6 @@ class Macro {
 
 	function convertType( t : Expr.CType ) : ComplexType {
 		return switch( t ) {
-		case CTOpt(t): TOptional(convertType(t));
 		case CTPath(pack, args):
 			var params = [];
 			if( args != null )
@@ -128,18 +127,10 @@ class Macro {
 		case CTParent(t): TParent(convertType(t));
 		case CTFun(args, ret):
 			TFunction(map(args,convertType), convertType(ret));
-		case CTNamed(name, convertType(_) => ct):
-			#if (haxe_ver >= 4)
-				TNamed(name, ct);
-			#else
-				ct;
-			#end
 		case CTAnon(fields):
 			var tf = [];
-			for( f in fields ) {
+			for( f in fields )
-				var meta = f.meta == null ? [] : [for( m in f.meta ) { name : m.name, params : m.params == null ? [] : [for( e in m.params ) convert(e)], pos : p }];
+				tf.push( { name : f.name, meta : [], doc : null, access : [], kind : FVar(convertType(f.t),null), pos : p } );
-				tf.push( { name : f.name, meta : meta, doc : null, access : [], kind : FVar(convertType(f.t), null), pos : p } );
-			}
 			TAnonymous(tf);
 		};
 	}
@@ -191,16 +182,14 @@ class Macro {
 				EWhile(convert(c), convert(e), true);
 			case EDoWhile(c, e):
 				EWhile(convert(c), convert(e), false);
+			#if (haxe_211 || haxe3)
 			case EFor(v, it, efor):
-				#if (haxe_ver >= 4)
+				var p = #if hscriptPos { file : p.file, min : e.pmin, max : e.pmax } #else p #end;
-					var p = #if hscriptPos { file : p.file, min : e.pmin, max : e.pmax } #else p #end;
+				EFor({ expr : EIn({ expr : EConst(CIdent(v)), pos : p },convert(it)), pos : p }, convert(efor));
-					EFor({ expr : EBinop(OpIn,{ expr : EConst(CIdent(v)), pos : p },convert(it)), pos : p }, convert(efor));
+			#else
-				#elseif (haxe_211 || haxe3)
+			case EFor(v, it, e):
-					var p = #if hscriptPos { file : p.file, min : e.pmin, max : e.pmax } #else p #end;
+				EFor(v, convert(it), convert(e));
-					EFor({ expr : EIn({ expr : EConst(CIdent(v)), pos : p },convert(it)), pos : p }, convert(efor));
+			#end
-				#else
-					EFor(v, convert(it), convert(efor));
-				#end
 			case EBreak:
 				EBreak;
 			case EContinue:
@@ -242,11 +231,6 @@ class Macro {
 				ETernary(convert(cond), convert(e1), convert(e2));
 			case ESwitch(e, cases, edef):
 				ESwitch(convert(e), [for( c in cases ) { values : [for( v in c.values ) convert(v)], expr : convert(c.expr) } ], edef == null ? null : convert(edef));
-			case EMeta(m, params, esub):
-				var mpos = #if hscriptPos { file : p.file, min : e.pmin, max : e.pmax } #else p #end;
-				EMeta({ name : m, params : params == null ? [] : [for( p in params ) convert(p)], pos : mpos }, convert(esub));
-			case ECheckType(e, t):
-				ECheckType(convert(e), convertType(t));
 		}, pos : #if hscriptPos { file : p.file, min : e.pmin, max : e.pmax } #else p #end }
 	}
 

hscript/Printer.hx

@@ -1,24 +1,3 @@
-/*
- * Copyright (C)2008-2017 Haxe Foundation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
 package hscript;
 import hscript.Expr;
 
@@ -37,20 +16,10 @@ class Printer {
 		return buf.toString();
 	}
 
-	public function typeToString( t : CType ) {
-		buf = new StringBuf();
-		tabs = "";
-		type(t);
-		return buf.toString();
-	}
-
 	inline function add<T>(s:T) buf.add(s);
 
 	function type( t : CType ) {
 		switch( t ) {
-		case CTOpt(t): 
-			add('?');
-			type(t);
 		case CTPath(path, params):
 			add(path.join("."));
 			if( params != null ) {
@@ -62,19 +31,6 @@ class Printer {
 				}
 				add(">");
 			}
-		case CTNamed(name, t):
-			add(name);
-			add(':');
-			type(t);
-		case CTFun(args, ret) if (Lambda.exists(args, function (a) return a.match(CTNamed(_, _)))):
-			add('(');
-			for (a in args)
-				switch a {
-					case CTNamed(_, _): type(a);
-					default: type(CTNamed('_', a));
-				}
-			add(')->');
-			type(ret);
 		case CTFun(args, ret):
 			if( args.length == 0 )
 				add("Void -> ");
@@ -302,26 +258,6 @@ class Printer {
 				add(";\n");
 			}
 			add("}");
-		case EMeta(name, args, e):
-			add("@");
-			add(name);
-			if( args != null && args.length > 0 ) {
-				add("(");
-				var first = true;
-				for( a in args ) {
-					if( first ) first = false else add(", ");
-					expr(e);
-				}
-				add(")");
-			}
-			add(" ");
-			expr(e);
-		case ECheckType(e, t):
-			add("(");
-			expr(e);
-			add(" : ");
-			addType(t);
-			add(")");
 		}
 	}
 
@@ -329,25 +265,4 @@ class Printer {
 		return new Printer().exprToString(e);
 	}
 
-	public static function errorToString( e : Expr.Error ) {
-		var message = switch( #if hscriptPos e.e #else e #end ) {
-			case EInvalidChar(c): "Invalid character: '"+String.fromCharCode(c)+"' ("+c+")";
-			case EUnexpected(s): "Unexpected token: \""+s+"\"";
-			case EUnterminatedString: "Unterminated string";
-			case EUnterminatedComment: "Unterminated comment";
-			case EInvalidPreprocessor(str): "Invalid preprocessor (" + str + ")";
-			case EUnknownVariable(v): "Unknown variable: "+v;
-			case EInvalidIterator(v): "Invalid iterator: "+v;
-			case EInvalidOp(op): "Invalid operator: "+op;
-			case EInvalidAccess(f): "Invalid access to field " + f;
-			case ECustom(msg): msg;
-		};
-		#if hscriptPos
-		return e.origin + ":" + e.line + ": " + message;
-		#else
-		return message;
-		#end
-	}
-
-
 }

hscript/Tools.hx

@@ -1,31 +1,10 @@
-/*
- * Copyright (C)2008-2017 Haxe Foundation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
 package hscript;
 import hscript.Expr;
 
 class Tools {
 
 	public static function iter( e : Expr, f : Expr -> Void ) {
-		switch( expr(e) ) {
+		switch( e ) {
 		case EConst(_), EIdent(_):
 		case EVar(_, _, e): if( e != null ) f(e);
 		case EParent(e): f(e);
@@ -55,14 +34,12 @@ class Tools {
 				f(c.expr);
 			}
 			if( def != null ) f(def);
-		case EMeta(name, args, e): if( args != null ) for( a in args ) f(a); f(e);
-		case ECheckType(e,_): f(e);
 		}
 	}
 
 	public static function map( e : Expr, f : Expr -> Expr ) {
-		var edef = switch( expr(e) ) {
+		return switch( e ) {
-		case EConst(_), EIdent(_), EBreak, EContinue: expr(e);
+		case EConst(_), EIdent(_): e;
 		case EVar(n, t, e): EVar(n, t, if( e != null ) f(e) else null);
 		case EParent(e): EParent(f(e));
 		case EBlock(el): EBlock([for( e in el ) f(e)]);
@@ -74,6 +51,7 @@ class Tools {
 		case EWhile(c, e): EWhile(f(c),f(e));
 		case EDoWhile(c, e): EDoWhile(f(c),f(e));
 		case EFor(v, it, e): EFor(v, f(it), f(e));
+		case EBreak, EContinue: e;
 		case EFunction(args, e, name, t): EFunction(args, f(e), name, t);
 		case EReturn(e): EReturn(if( e != null ) f(e) else null);
 		case EArray(e, i): EArray(f(e),f(i));
@@ -84,26 +62,7 @@ class Tools {
 		case EObject(fl): EObject([for( fi in fl ) { name : fi.name, e : f(fi.e) }]);
 		case ETernary(c, e1, e2): ETernary(f(c), f(e1), f(e2));
 		case ESwitch(e, cases, def): ESwitch(f(e), [for( c in cases ) { values : [for( v in c.values ) f(v)], expr : f(c.expr) } ], def == null ? null : f(def));
-		case EMeta(name, args, e): EMeta(name, args == null ? null : [for( a in args ) f(a)], f(e));
-		case ECheckType(e,t): ECheckType(f(e), t);
 		}
-		return mk(edef, e);
-	}
-
-	public static inline function expr( e : Expr ) : ExprDef {
-		#if hscriptPos
-		return e.e;
-		#else
-		return e;
-		#end
-	}
-
-	public static inline function mk( e : ExprDef, p : Expr ) {
-		#if hscriptPos
-		return { e : e, pmin : p.pmin, pmax : p.pmax, origin : p.origin, line : p.line };
-		#else
-		return e;
-		#end
 	}
 
 }

release.bat

@@ -1,5 +1,4 @@
 @echo off
-set PATH="C:\Program Files\7-Zip";%PATH%
 rm -rf release
 mkdir release
 cp haxelib.json README.md extraParams.hxml release